[jboss-cvs] JBossAS SVN: r94296 - in trunk: component-matrix and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2009-10-02 16:13:01 -0400 (Fri, 02 Oct 2009)
New Revision: 94296

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
   trunk/testsuite/build.xml
Log:
[JBBUILD-540] Remove duplicate dependencies and use preferred groupIds for jaxb-xjc and jaxb-impl

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-10-02 19:49:43 UTC (rev 94295)
+++ trunk/build/build.xml	2009-10-02 20:13:01 UTC (rev 94296)
@@ -2105,8 +2105,8 @@
       <fileset refid="org.jboss:jboss-vfs:jar"/>
       <fileset refid="org.osgi:osgi_R4_core:jar"/>
       <fileset refid="trove:trove:jar"/>
-      <fileset refid="sun-jaxb:jaxb-impl:jar"/>
-      <fileset refid="sun-jaxb:jaxb-xjc:jar"/>
+      <fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
+      <fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
       <fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-asintegration-core:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-asintegration-jmx:jar"/>
@@ -2173,8 +2173,8 @@
       <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
       <fileset refid="javax.activation:activation:jar"/>
       <fileset refid="javax.mail:mail:jar"/>
-      <fileset refid="sun-jaxb:jaxb-impl:jar"/>
-      <fileset refid="sun-jaxb:jaxb-xjc:jar"/>
+      <fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
+      <fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
       <fileset refid="com.sun.xml.ws:jaxws-tools:jar"/>
       <fileset refid="com.sun.xml.ws:jaxws-rt:jar"/>
       <fileset refid="sun-jaxws:stax-ex:jar"/>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-10-02 19:49:43 UTC (rev 94295)
+++ trunk/build/pom.xml	2009-10-02 20:13:01 UTC (rev 94296)
@@ -522,11 +522,11 @@
       <artifactId>jaxb-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaxb</groupId>
+      <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaxb</groupId>
+      <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
     <dependency>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-02 19:49:43 UTC (rev 94295)
+++ trunk/component-matrix/pom.xml	2009-10-02 20:13:01 UTC (rev 94296)
@@ -457,13 +457,19 @@
       </dependency>
       
       <dependency>
-        <groupId>sun-jaxb</groupId>
+        <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
         <version>${version.sun.jaxb}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
-        <groupId>sun-jaxb</groupId>
+        <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-xjc</artifactId>
         <version>${version.sun.jaxb}</version>
       </dependency>
@@ -2295,7 +2301,7 @@
                         <exclude>bsh:bsh</exclude>
                         <exclude>bsf:bsf</exclude>
                         <exclude>javax.xml.stream:stax-api</exclude>
-                        <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+                        <exclude>sun-jaxb:jaxb-impl</exclude>
                         <exclude>javax.xml.bind:jaxb-api</exclude>
                         <exclude>sun-jaxws:jaxws-tools</exclude>
                         <exclude>apache-xerces:xercesImpl</exclude>
@@ -2317,6 +2323,7 @@
                         <exclude>org.jboss.jbossas:jboss-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap-impl-as JBAS-6856 -->
                         <exclude>wutka-dtdparser:dtdparser121</exclude>
                         <exclude>sun-jaxws:jaxws-rt</exclude>
+                        <exclude>sun-jaxb:jaxb-xjc</exclude>
                       </excludes>
                     </bannedDependencies>
                   </rules>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-10-02 19:49:43 UTC (rev 94295)
+++ trunk/testsuite/build.xml	2009-10-02 20:13:01 UTC (rev 94296)
@@ -244,8 +244,8 @@
       <fileset refid="javax.activation:activation:jar"/>
       <fileset refid="javax.mail:mail:jar"/>
       <fileset refid="sun-jaxb:jaxb-api:jar"/>
-      <fileset refid="sun-jaxb:jaxb-impl:jar"/>
-      <fileset refid="sun-jaxb:jaxb-xjc:jar"/>
+      <fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
+      <fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
       <fileset refid="javax.faces:jsf-api:jar"/>
       <fileset refid="javax.faces:jsf-impl:jar"/>
       <fileset refid="javax.validation:validation-api:jar"/>