[jboss-cvs] JBossAS SVN: r71274 - trunk/thirdparty.

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

Author: pgier
Date: 2008-03-25 16:49:27 -0400 (Tue, 25 Mar 2008)
New Revision: 71274

Modified:
   trunk/thirdparty/pom.xml
Log:
Add combined jboss-integration jar.  Change sun jaxb jar groupIds to match ant builds.

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-03-25 20:48:36 UTC (rev 71273)
+++ trunk/thirdparty/pom.xml	2008-03-25 20:49:27 UTC (rev 71274)
@@ -215,27 +215,6 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>javax.xml.bind</groupId>
-              <artifactId>jaxb-api</artifactId>
-              <mapping>
-                <componentId>sun-jaxb</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>javax.xml</groupId>
-              <artifactId>jaxb-impl</artifactId>
-              <mapping>
-                <componentId>sun-jaxb</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>javax.xml</groupId>
-              <artifactId>jaxb-xjc</artifactId>
-              <mapping>
-                <componentId>sun-jaxb</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>org.codehaus.woodstox</groupId>
               <artifactId>wstx-lgpl</artifactId>
               <mapping>
@@ -301,8 +280,17 @@
                 <componentId>jboss.integration</componentId>
               </mapping>
             </dependency>
+            <!-- Combined integration jar.  Maybe this can be removed when we just use the 
+            -  individual compoennts -->
             <dependency>
               <groupId>org.jboss</groupId>
+              <artifactId>jboss-integration</artifactId>
+              <mapping>
+                <componentId>jboss.integration</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss</groupId>
               <artifactId>jboss-corba-ots-spi</artifactId>
               <mapping>
                 <componentId>jboss.integration</componentId>
@@ -989,7 +977,13 @@
       <groupId>jboss.aop</groupId>
       <artifactId>pluggable-instrumentor</artifactId>
     </dependency>
+    <!-- Combined integration jar.  Maybe this can be removed when we just use the 
+      -  individual compoennts -->
     <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-integration</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-core</artifactId>
     </dependency>
@@ -1389,15 +1383,15 @@
       <artifactId>jstl</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
+      <groupId>sun-jaxb</groupId>
       <artifactId>jaxb-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml</groupId>
+      <groupId>sun-jaxb</groupId>
       <artifactId>jaxb-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml</groupId>
+      <groupId>sun-jaxb</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
     <dependency>