[jboss-cvs] JBossAS SVN: r95768 - in branches/Branch_5_x: thirdparty and 1 other directory.

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

Author: pgier
Date: 2009-10-29 12:41:16 -0400 (Thu, 29 Oct 2009)
New Revision: 95768

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
[JBBUILD-570] Use Maven standard groupIds for jaxws-rt and jaxws-tools.

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-10-29 16:39:24 UTC (rev 95767)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-10-29 16:41:16 UTC (rev 95768)
@@ -898,10 +898,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>
@@ -2186,13 +2182,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.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</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>
@@ -2350,7 +2360,8 @@
                         <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-rt</exclude>
+                        <exclude>sun-jaxws:jaxws-tools</exclude>
                         <exclude>apache-xerces:xercesImpl</exclude>
                         <exclude>ant:ant</exclude>
                         <exclude>apache-log4j:log4j</exclude>
@@ -2363,8 +2374,8 @@
                         <exclude>xml-apis:xml-apis</exclude>
                         <exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
                         <exclude>sun-jaxws:FastInfoset</exclude>
-			<!-- JBAS-6904: use org.hibernate:hibernate-core -->
-			<exclude>org.hibernate:hibernate</exclude>
+			                  <!-- JBAS-6904: use org.hibernate:hibernate-core -->
+			                  <exclude>org.hibernate:hibernate</exclude>
                         <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 -->
                       </excludes>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-10-29 16:39:24 UTC (rev 95767)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-10-29 16:41:16 UTC (rev 95768)
@@ -116,6 +116,22 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>com.sun.xml.ws</groupId>
+              <exportArtifact>false</exportArtifact>
+              <artifactId>jaxws-rt</artifactId>
+              <mapping>
+                <componentId>sun-jaxws</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>com.sun.xml.ws</groupId>
+              <artifactId>jaxws-tools</artifactId>
+              <exportArtifact>false</exportArtifact>
+              <mapping>
+                <componentId>sun-jaxws</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
               <groupId>commons-lang</groupId>
               <artifactId>commons-lang</artifactId>
               <mapping>
@@ -969,16 +985,6 @@
             </dependency>
             <dependency>
               <groupId>sun-jaxws</groupId>
-              <artifactId>jaxws-rt</artifactId>
-              <exportArtifact>false</exportArtifact>
-            </dependency>
-            <dependency>
-              <groupId>sun-jaxws</groupId>
-              <artifactId>jaxws-tools</artifactId>
-              <exportArtifact>false</exportArtifact>
-            </dependency>            
-            <dependency>
-              <groupId>sun-jaxws</groupId>
               <artifactId>stax-ex</artifactId>
               <exportArtifact>false</exportArtifact>
             </dependency>
@@ -2052,11 +2058,11 @@
       <artifactId>jsf-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaxws</groupId>
+      <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-rt</artifactId>
     </dependency>    
     <dependency>
-      <groupId>sun-jaxws</groupId>
+      <groupId>com.sun.xml.ws</groupId>
       <artifactId>jaxws-tools</artifactId>
     </dependency>    
     <dependency>