You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/10/13 18:44:16 UTC

svn commit: r1182970 - in /geronimo/server/branches/2.1: ./ buildsupport/car-maven-plugin/ framework/configs/client-system/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-i...

Author: genspring
Date: Thu Oct 13 16:44:15 2011
New Revision: 1182970

URL: http://svn.apache.org/viewvc?rev=1182970&view=rev
Log:
try jaxb 2.2 for geronimo 2.1 branch.

Modified:
    geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/branches/2.1/framework/configs/client-system/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml
    geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml
    geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml
    geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml
    geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml
    geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml

Modified: geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml Thu Oct 13 16:44:15 2011
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/client-system/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/client-system/pom.xml Thu Oct 13 16:44:15 2011
@@ -82,7 +82,7 @@
         <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Thu Oct 13 16:44:15 2011
@@ -94,7 +94,7 @@
         <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Thu Oct 13 16:44:15 2011
@@ -94,7 +94,7 @@
         <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml Thu Oct 13 16:44:15 2011
@@ -87,7 +87,7 @@
         <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml Thu Oct 13 16:44:15 2011
@@ -133,7 +133,7 @@
         <!--
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
         -->
 

Modified: geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml Thu Oct 13 16:44:15 2011
@@ -102,7 +102,7 @@
         <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml Thu Oct 13 16:44:15 2011
@@ -79,7 +79,7 @@
         <!-- used by plugin installer -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml Thu Oct 13 16:44:15 2011
@@ -100,7 +100,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml Thu Oct 13 16:44:15 2011
@@ -77,7 +77,7 @@
         <!-- plugin management -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml Thu Oct 13 16:44:15 2011
@@ -158,7 +158,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml Thu Oct 13 16:44:15 2011
@@ -78,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Oct 13 16:44:15 2011
@@ -1383,14 +1383,14 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-                <version>1.0</version>
+                <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.1.13</version>
+                <version>2.2.3-1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
@@ -1402,7 +1402,7 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-xjc</artifactId>
-                <version>2.1.13</version>
+                <version>2.2.3-1</version>
             </dependency>
             
             <dependency>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Thu Oct 13 16:44:15 2011
@@ -40,7 +40,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <artifactId>geronimo-jaxb_2.2_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Thu Oct 13 16:44:15 2011
@@ -65,7 +65,7 @@
         
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <artifactId>geronimo-jaxb_2.2_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Thu Oct 13 16:44:15 2011
@@ -37,7 +37,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <artifactId>geronimo-jaxb_2.2_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=1182970&r1=1182969&r2=1182970&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Thu Oct 13 16:44:15 2011
@@ -86,7 +86,7 @@
         
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <artifactId>geronimo-jaxb_2.2_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>