bval-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1542195 - in /bval/branches/bval-11: bval-extras/pom.xml bval-jsr/pom.xml bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java bval-tck/pom.xml bval-tck11/pom.xml pom.xml
Date Fri, 15 Nov 2013 08:13:42 GMT
Author: rmannibucau
Date: Fri Nov 15 08:13:41 2013
New Revision: 1542195

URL: http://svn.apache.org/r1542195
Log:
using geronimo spec jars

Modified:
    bval/branches/bval-11/bval-extras/pom.xml
    bval/branches/bval-11/bval-jsr/pom.xml
    bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java
    bval/branches/bval-11/bval-tck/pom.xml
    bval/branches/bval-11/bval-tck11/pom.xml
    bval/branches/bval-11/pom.xml

Modified: bval/branches/bval-11/bval-extras/pom.xml
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/pom.xml?rev=1542195&r1=1542194&r2=1542195&view=diff
==============================================================================
--- bval/branches/bval-11/bval-extras/pom.xml (original)
+++ bval/branches/bval-11/bval-extras/pom.xml Fri Nov 15 08:13:41 2013
@@ -68,18 +68,10 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>1.1.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <!-- TODO
-                <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-validation_1.0_spec</artifactId>
+                    <artifactId>geronimo-validation_1.1_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-                -->
             </dependencies>
         </profile>
         <!--

Modified: bval/branches/bval-11/bval-jsr/pom.xml
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/pom.xml?rev=1542195&r1=1542194&r2=1542195&view=diff
==============================================================================
--- bval/branches/bval-11/bval-jsr/pom.xml (original)
+++ bval/branches/bval-11/bval-jsr/pom.xml Fri Nov 15 08:13:41 2013
@@ -47,18 +47,10 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                    <version>1.1.0.Final</version>
-                    <scope>provided</scope>
-                </dependency>
-                <!-- TODO
-                <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-validation_1.0_spec</artifactId>
+                    <artifactId>geronimo-validation_1.1_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-                -->
             </dependencies>
         </profile>
         <!--
@@ -148,18 +140,10 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-        <!-- TODO: get spec v1.2 to replace JBoss spec jar
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        -->
         <dependency>
-          <groupId>org.jboss.spec.javax.interceptor</groupId>
-          <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
-          <version>1.0.0.Alpha1</version>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+          <version>1.0-SNAPSHOT</version>
           <scope>provided</scope>
         </dependency>
         <dependency>

Modified: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java?rev=1542195&r1=1542194&r2=1542195&view=diff
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java
(original)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java
Fri Nov 15 08:13:41 2013
@@ -1,18 +1,18 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2012-2013, Red Hat, Inc. and/or its affiliates, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.apache.bval.jsr;
 

Modified: bval/branches/bval-11/bval-tck/pom.xml
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-tck/pom.xml?rev=1542195&r1=1542194&r2=1542195&view=diff
==============================================================================
--- bval/branches/bval-11/bval-tck/pom.xml (original)
+++ bval/branches/bval-11/bval-tck/pom.xml Fri Nov 15 08:13:41 2013
@@ -149,23 +149,10 @@
                 </property>
             </activation>
             <dependencies>
-                <!-- Use the geronimo-validation spec instead
-                <dependency>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </dependency>
-                -->
-                <dependency>
-                  <groupId>javax.validation</groupId>
-                  <artifactId>validation-api</artifactId>
-                  <scope>provided</scope>
-                </dependency>
-                <!-- TODO
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-validation_1.0_spec</artifactId>
+                    <artifactId>geronimo-validation_1.1_spec</artifactId>
                 </dependency>
-                -->
                 <dependency>
                     <groupId>org.testng</groupId>
                     <artifactId>testng</artifactId>
@@ -258,22 +245,12 @@
                                             <classifier>suite</classifier>
                                             <overWrite>false</overWrite>
                                         </artifactItem>
-                                        <!-- TODO: use geronimo-validation spec -->
-                                        <artifactItem>
-                                            <groupId>javax.validation</groupId>
-                                            <artifactId>validation-api</artifactId>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                                        </artifactItem>
-
-                                        <!-- TODO
                                         <artifactItem>
                                             <groupId>org.apache.geronimo.specs</groupId>
-                                            <artifactId>geronimo-validation_1.0_spec</artifactId>
+                                            <artifactId>geronimo-validation_1.1_spec</artifactId>
                                             <overWrite>true</overWrite>
                                             <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                                         </artifactItem>
-                                        -->
                                         <artifactItem>
                                             <groupId>org.apache.bval</groupId>
                                             <artifactId>org.apache.bval.bundle</artifactId>

Modified: bval/branches/bval-11/bval-tck11/pom.xml
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-tck11/pom.xml?rev=1542195&r1=1542194&r2=1542195&view=diff
==============================================================================
--- bval/branches/bval-11/bval-tck11/pom.xml (original)
+++ bval/branches/bval-11/bval-tck11/pom.xml Fri Nov 15 08:13:41 2013
@@ -41,9 +41,9 @@ under the License.
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
+          <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.1_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -59,18 +59,10 @@ under the License.
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <!-- TODO: get spec v1.2 to replace JBoss spec jar
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.jboss.spec.javax.interceptor</groupId>
-            <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
-            <version>1.0.0.Alpha1</version>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: bval/branches/bval-11/pom.xml
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/pom.xml?rev=1542195&r1=1542194&r2=1542195&view=diff
==============================================================================
--- bval/branches/bval-11/pom.xml (original)
+++ bval/branches/bval-11/pom.xml Fri Nov 15 08:13:41 2013
@@ -283,14 +283,11 @@
     -->
     <dependencyManagement>
         <dependencies>
-            <!-- Default of Apache Geronimo version of the Spec API -->
-            <!-- TODO
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-validation_1.0_spec</artifactId>
-                <version>1.1</version>
+                <artifactId>geronimo-validation_1.1_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
             </dependency>
-            -->
             <!-- Optional profile to use Spec RI API -->
             <dependency>
                 <groupId>javax.validation</groupId>
@@ -395,9 +392,9 @@
                             </manifest>
                             <manifestEntries>
                                 <Implementation-Build>${buildNumber}</Implementation-Build>
-                                <Specification-Title>JSR-303 Bean Validation</Specification-Title>
+                                <Specification-Title>JSR-349 Bean Validation</Specification-Title>
                                 <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-                                <Specification-Version>1.0</Specification-Version>
+                                <Specification-Version>1.1</Specification-Version>
                             </manifestEntries>
                         </archive>
                     </configuration>



Mime
View raw message