[jboss-cvs] JBossAS SVN: r81578 - in trunk: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 25 17:20:32 EST 2008
Author: pgier
Date: 2008-11-25 17:20:31 -0500 (Tue, 25 Nov 2008)
New Revision: 81578
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/connector/build.xml
trunk/profileservice/build.xml
trunk/security/build.xml
trunk/system/build.xml
trunk/testsuite/build.xml
trunk/thirdparty/pom.xml
Log:
[JBAS-6055] Exclude some duplicate dependencies.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/build/build-distr.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -1979,7 +1979,7 @@
<fileset dir="${sun.jaf.lib}">
<include name="activation.jar"/>
</fileset>
- <fileset dir="${stax.api.lib}">
+ <fileset dir="${stax.stax.lib}">
<include name="stax-api.jar"/>
</fileset>
</copy>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/component-matrix/pom.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -107,6 +107,11 @@
<exclude>jboss:jboss-common</exclude>
<exclude>javax.el:el-api</exclude>
<exclude>bsh:bsh</exclude>
+ <exclude>javax.xml.stream:stax-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>
</excludes>
</bannedDependencies>
</rules>
@@ -255,7 +260,7 @@
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
</dependency>
@@ -759,6 +764,22 @@
<groupId>woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -772,6 +793,16 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-jaxws</artifactId>
<version>${version.jboss.jbossws}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1282,6 +1313,10 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/connector/build.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -90,7 +90,7 @@
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="sun.jaf.classpath"/>
- <path refid="stax.api.classpath"/>
+ <path refid="stax.stax.classpath"/>
</path>
<!-- ======= -->
Modified: trunk/profileservice/build.xml
===================================================================
--- trunk/profileservice/build.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/profileservice/build.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -83,7 +83,7 @@
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="stax.api.classpath"/>
+ <path refid="stax.stax.classpath"/>
<path refid="org.jboss.aspects.classpath"/>
</path>
Modified: trunk/security/build.xml
===================================================================
--- trunk/security/build.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/security/build.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -74,7 +74,7 @@
<path id="library.classpath">
<path refid="apache.log4j.classpath"/>
<path refid="javassist.classpath"/>
- <path refid="javax.xml.bind.classpath"/>
+ <path refid="sun.jaxb.classpath"/>
</path>
Modified: trunk/system/build.xml
===================================================================
--- trunk/system/build.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/system/build.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -87,7 +87,7 @@
<path refid="javassist.javassist.classpath"/>
<!-- jaxb for attachment serialization -->
<path refid="sun.jaxb.classpath"/>
- <path refid="javax.xml.stream.classpath"/>
+ <path refid="stax.stax.classpath"/>
</path>
&modules;
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/testsuite/build.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -144,7 +144,7 @@
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.integration.classpath"/>
<path refid="jboss.profileservice.spi.classpath"/>
- <path refid="stax.api.classpath"/>
+ <path refid="stax.stax.classpath"/>
<!-- needed for messaging JMS provider tests -->
<path refid="jboss.messaging.classpath"/>
<!-- needed for proxy tests -->
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-11-25 21:44:59 UTC (rev 81577)
+++ trunk/thirdparty/pom.xml 2008-11-25 22:20:31 UTC (rev 81578)
@@ -855,14 +855,6 @@
</mapping>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <mapping>
- <componentId>stax-api</componentId>
- </mapping>
- </dependency>
-
- <dependency>
<groupId>sun-jaxws</groupId>
<artifactId>FastInfoset</artifactId>
<exportArtifact>false</exportArtifact>
@@ -942,6 +934,13 @@
<componentId>ibm-wsdl4j</componentId>
</mapping>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <mapping>
+ <componentId>apache-xerces</componentId>
+ </mapping>
+ </dependency>
<!-- End mapped dependecies -->
@@ -1068,7 +1067,7 @@
<artifactId>resolver</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list