[jboss-cvs] JBossAS SVN: r105122 - in branches/JBPAPP_5_0: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat May 22 21:29:24 EDT 2010
Author: fnasser at redhat.com
Date: 2010-05-22 21:29:24 -0400 (Sat, 22 May 2010)
New Revision: 105122
Modified:
branches/JBPAPP_5_0/build/build-distr.xml
branches/JBPAPP_5_0/component-matrix/pom.xml
branches/JBPAPP_5_0/thirdparty/pom.xml
Log:
Revert for testing: JBPAPP-4251 - Upgrade JAXB to 2.1.12
Modified: branches/JBPAPP_5_0/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0/build/build-distr.xml 2010-05-22 12:47:15 UTC (rev 105121)
+++ branches/JBPAPP_5_0/build/build-distr.xml 2010-05-23 01:29:24 UTC (rev 105122)
@@ -2011,7 +2011,7 @@
<fileset dir="${trove.trove.lib}">
<include name="trove.jar"/>
</fileset>
- <fileset dir="${com.sun.xml.bind.lib}">
+ <fileset dir="${sun.jaxb.lib}">
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
</fileset>
@@ -2106,7 +2106,7 @@
<fileset dir="${sun.javamail.lib}">
<include name="mail.jar"/>
</fileset>
- <fileset dir="${com.sun.xml.bind.lib}">
+ <fileset dir="${sun.jaxb.lib}">
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
</fileset>
Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml 2010-05-22 12:47:15 UTC (rev 105121)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml 2010-05-23 01:29:24 UTC (rev 105122)
@@ -104,8 +104,7 @@
<version.streambuffer>2.1.3</version.streambuffer>
<version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
<version.sun-jaxws>2.1.7</version.sun-jaxws>
- <version.sun.jaxb>2.1.12.patch01</version.sun.jaxb>
- <version.sun.jaxb.api>2.1</version.sun.jaxb.api>
+ <version.sun.jaxb>2.1.9.patch02</version.sun.jaxb>
<version.xdoclet>1.2.3</version.xdoclet>
</properties>
@@ -452,25 +451,19 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${version.sun.jaxb.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>${version.sun.jaxb}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.sun.jaxb}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${version.sun.jaxb}</version>
</dependency>
@@ -810,18 +803,6 @@
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
@@ -856,10 +837,6 @@
<version>${version.jboss.jbossws}</version>
<exclusions>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
@@ -1354,10 +1331,6 @@
<version>${version.org.jboss.metadata}</version>
<exclusions>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.jboss</groupId>
<artifactId>jboss-jaxws</artifactId>
</exclusion>
@@ -1484,10 +1457,6 @@
<version>${version.org.jboss.jbossxb}</version>
<exclusions>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</exclusion>
@@ -1622,10 +1591,6 @@
<version>${version.org.jboss.cluster.cache.spi}</version>
<exclusions>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
</exclusion>
@@ -1994,12 +1959,6 @@
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
<version>${version.org.jboss.man}</version>
- <exclusions>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -2384,9 +2343,8 @@
<exclude>bsh:bsh</exclude>
<exclude>javax.security:jaas</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
- <exclude>sun-jaxb:jaxb-impl</exclude>
- <exclude>sun-jaxb:jaxb-xjc</exclude>
- <exclude>sun-jaxb:jaxb-api</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+ <exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>com.sun.xml.ws:jaxws-tools</exclude>
<exclude>apache-xerces:xercesImpl</exclude>
<exclude>ant:ant</exclude>
Modified: branches/JBPAPP_5_0/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0/thirdparty/pom.xml 2010-05-22 12:47:15 UTC (rev 105121)
+++ branches/JBPAPP_5_0/thirdparty/pom.xml 2010-05-23 01:29:24 UTC (rev 105122)
@@ -175,13 +175,6 @@
</mapping>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <mapping>
- <componentId>sun-jaxb</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
<mapping>
@@ -1920,15 +1913,15 @@
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list