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

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

Author: pgier
Date: 2009-10-02 15:48:30 -0400 (Fri, 02 Oct 2009)
New Revision: 94294

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
Log:
[JBBUILD-540] Remove duplicate dependencies and use preferred groupIds for jaxws-rt and jaxws-tools

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-10-02 19:34:39 UTC (rev 94293)
+++ trunk/build/build.xml	2009-10-02 19:48:30 UTC (rev 94294)
@@ -2175,8 +2175,8 @@
       <fileset refid="javax.mail:mail:jar"/>
       <fileset refid="sun-jaxb:jaxb-impl:jar"/>
       <fileset refid="sun-jaxb:jaxb-xjc:jar"/>
-      <fileset refid="sun-jaxws:jaxws-tools:jar"/>
-      <fileset refid="sun-jaxws:jaxws-rt: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"/>
       <fileset refid="sun-jaxws:streambuffer:jar"/>
       <fileset refid="trove:trove:jar"/>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-10-02 19:34:39 UTC (rev 94293)
+++ trunk/build/pom.xml	2009-10-02 19:48:30 UTC (rev 94294)
@@ -229,6 +229,14 @@
       <artifactId>resolver</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.sun.xml.ws</groupId>
+      <artifactId>jaxws-rt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.ws</groupId>
+      <artifactId>jaxws-tools</artifactId>
+    </dependency>    
+    <dependency>
       <groupId>jacorb</groupId>
       <artifactId>jacorb</artifactId>
     </dependency>
@@ -523,14 +531,6 @@
     </dependency>
     <dependency>
       <groupId>sun-jaxws</groupId>
-      <artifactId>jaxws-rt</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>sun-jaxws</groupId>
-      <artifactId>jaxws-tools</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>sun-jaxws</groupId>
       <artifactId>stax-ex</artifactId>
     </dependency>
     <dependency>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-02 19:34:39 UTC (rev 94293)
+++ trunk/component-matrix/pom.xml	2009-10-02 19:48:30 UTC (rev 94294)
@@ -835,10 +835,6 @@
             <artifactId>jaxb-impl</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-tools</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
           </exclusion>
@@ -2126,13 +2122,27 @@
       </dependency>
       
       <dependency>
-        <groupId>sun-jaxws</groupId>
+        <groupId>com.sun.xml.ws</groupId>
         <artifactId>jaxws-rt</artifactId>
         <version>${version.sun-jaxws}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
-        <groupId>sun-jaxws</groupId>
+        <groupId>com.sun.xml.ws</groupId>
         <artifactId>jaxws-tools</artifactId>
         <version>${version.sun-jaxws}</version>
       </dependency>
@@ -2287,7 +2297,7 @@
                         <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>sun-jaxws:jaxws-tools</exclude>
                         <exclude>apache-xerces:xercesImpl</exclude>
                         <exclude>ant:ant</exclude>
                         <exclude>apache-log4j:log4j</exclude>
@@ -2306,6 +2316,7 @@
                         <exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
                         <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>
                       </excludes>
                     </bannedDependencies>
                   </rules>