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/08/18 17:00:39 UTC
svn commit: r1159269 - 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 Aug 18 15:00:38 2011
New Revision: 1159269
URL: http://svn.apache.org/viewvc?rev=1159269&view=rev
Log:
upgrade jaxb to 2.1.13 and use geronimio jaxb 2.1 spec
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-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -40,14 +40,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -81,8 +81,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -93,8 +93,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
@@ -190,8 +190,8 @@
</element>
<!-- TODO bad idea... temp, for plugins -->
<element>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</element>
<element>
<groupId>com.sun.xml.bind</groupId>
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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -93,8 +93,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
@@ -190,8 +190,8 @@
</element>
<!-- TODO bad idea... temp, for plugins -->
<element>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</element>
<element>
<groupId>com.sun.xml.bind</groupId>
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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -86,8 +86,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -132,8 +132,8 @@
-->
<!--
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
-->
<!-- JAXB Impl should not be here! -->
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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -101,8 +101,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -78,8 +78,8 @@
<!-- used by plugin installer -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -99,8 +99,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -76,8 +76,8 @@
<!-- plugin management -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -157,8 +157,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=1159269&r1=1159268&r2=1159269&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Thu Aug 18 15:00:38 2011
@@ -43,7 +43,7 @@ public class JAXWSTools {
{
{ "org.apache.axis2", "axis2-jaxws-api" },
{ "org.apache.geronimo.specs", "geronimo-saaj_1.3_spec" },
- { "javax.xml.bind", "jaxb-api" },
+ { "org.apache.geronimo.specs", "geronimo-jaxb_2.1_spec" },
{ "com.sun.xml.bind", "jaxb-impl" },
{ "com.sun.xml.bind", "jaxb-xjc" },
{ "com.sun.xml.ws", "jaxws-tools" },
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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -77,8 +77,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Aug 18 15:00:38 2011
@@ -1382,23 +1382,15 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <!--version>2.1</version-->
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
- <!--version>2.1.12</version-->
+ <version>2.1.13</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@@ -1414,7 +1406,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.0.5</version>
+ <version>2.1.13</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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -64,8 +64,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_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=1159269&r1=1159268&r2=1159269&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 Aug 18 15:00:38 2011
@@ -85,8 +85,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>