You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/09/27 08:44:55 UTC
svn commit: r1176231 - 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: rwonly
Date: Tue Sep 27 06:44:54 2011
New Revision: 1176231
URL: http://svn.apache.org/viewvc?rev=1176231&view=rev
Log:
GERONIMO-6176 exclude jaxb-api from jaxb-impl dependency. we use geronimo-jaxb 2.1 spec now.
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/openejb/geronimo-openejb/pom.xml
geronimo/server/branches/2.1/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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -45,14 +45,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
</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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -86,6 +86,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -96,7 +96,12 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -194,6 +199,10 @@
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</element>
<element>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </element>
+ <element>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</element>
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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -96,6 +96,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -194,6 +199,10 @@
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</element>
<element>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </element>
+ <element>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</element>
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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -91,6 +91,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -136,13 +136,7 @@
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
-->
- <!-- JAXB Impl should not be here! -->
- <!--
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- -->
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -105,6 +105,10 @@
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -82,6 +82,10 @@
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -102,6 +102,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
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=1176231&r1=1176230&r2=1176231&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 Tue Sep 27 06:44:54 2011
@@ -81,6 +81,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml?rev=1176231&r1=1176230&r2=1176231&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml Tue Sep 27 06:44:54 2011
@@ -114,16 +114,10 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- g-transaction, g-security, g-naming come transitively from this -->
Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=1176231&r1=1176230&r2=1176231&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Sep 27 06:44:54 2011
@@ -1394,11 +1394,7 @@
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
+ <artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
</dependency>