[jboss-cvs] JBossAS SVN: r70787 - in trunk: thirdparty and 1 other directory.

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

Author: pgier
Date: 2008-03-12 17:16:58 -0400 (Wed, 12 Mar 2008)
New Revision: 70787

Modified:
   trunk/pom.xml
   trunk/thirdparty/pom.xml
Log:
[JBBUILD-453] Fixing a few dependencies.

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-03-12 20:51:31 UTC (rev 70786)
+++ trunk/pom.xml	2008-03-12 21:16:58 UTC (rev 70787)
@@ -557,9 +557,9 @@
         <type>war</type>
       </dependency>
       <dependency>
-        <groupId>jboss</groupId>
+        <groupId>jboss.jbossws-framework</groupId>
         <artifactId>jbossws-framework</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>3.0.0.GA</version>
       </dependency>
       <dependency>
         <groupId>jboss.jbossws-framework</groupId>
@@ -572,9 +572,9 @@
       <artifactId>jbossws-native50</artifactId>
       </dependency>-->
       <dependency>
-        <groupId>jboss</groupId>
+        <groupId>jboss.jbossws-spi</groupId>
         <artifactId>jbossws-spi</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1.GA</version>
       </dependency>
       <dependency>
         <groupId>jboss</groupId>
@@ -582,9 +582,9 @@
         <version>2.2.1.GA</version>
       </dependency>
       <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>web</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <groupId>jboss.web</groupId>
+        <artifactId>jbossweb</artifactId>
+        <version>2.1.0.CR13</version>
       </dependency>
       <dependency>
         <groupId>jboss.jaxbintros</groupId>
@@ -735,11 +735,6 @@
       </dependency>
       <dependency>
         <groupId>org.jboss</groupId>
-        <artifactId>jbossws-spi</artifactId>
-        <version>1.0.0.GA</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss</groupId>
         <artifactId>jboss-classloading-spi</artifactId>
         <version>5.0.0-SNAPSHOT</version>
         <exclusions>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-03-12 20:51:31 UTC (rev 70786)
+++ trunk/thirdparty/pom.xml	2008-03-12 21:16:58 UTC (rev 70787)
@@ -480,13 +480,6 @@
                 <componentId>jboss.jbossws-common</componentId>
               </mapping>
             </dependency>
-            <dependency>
-              <groupId>jboss</groupId>
-              <artifactId>jbossws-framework</artifactId>
-              <mapping>
-                <componentId>jboss.jbossws-framework</componentId>
-              </mapping>
-            </dependency>
             <!--<dependency>
             <groupId>jboss</groupId>
             <artifactId>jbossws-native50</artifactId>
@@ -495,13 +488,6 @@
             </mapping>
             </dependency>-->
             <dependency>
-              <groupId>jboss</groupId>
-              <artifactId>jbossws-spi</artifactId>
-              <mapping>
-                <componentId>jboss.jbossws-spi</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>org.jboss</groupId>
               <artifactId>jbossxb</artifactId>
               <mapping>
@@ -670,13 +656,6 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>jboss</groupId>
-              <artifactId>web</artifactId>
-              <mapping>
-                <componentId>jboss.web</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>org.osgi</groupId>
               <artifactId>osgi_R4_compendium</artifactId>
               <mapping>
@@ -1169,16 +1148,16 @@
       <artifactId>jbossws-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jbossws-framework</artifactId>
-    </dependency>
-    <dependency>
       <groupId>jboss.jbossws</groupId>
       <artifactId>jbossws-context</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>jboss.jbossws-framework</groupId>
+      <artifactId>jbossws-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossws-framework</groupId>
       <artifactId>jbossws-framework-scripts</artifactId>
       <type>zip</type>
     </dependency>
@@ -1187,7 +1166,7 @@
     <artifactId>jbossws-native50</artifactId>
     </dependency>-->
     <dependency>
-      <groupId>jboss</groupId>
+      <groupId>jboss.jbossws-spi</groupId>
       <artifactId>jbossws-spi</artifactId>
     </dependency>
     
@@ -1289,8 +1268,8 @@
       <artifactId>jboss-test</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>web</artifactId>
+      <groupId>jboss.web</groupId>
+      <artifactId>jbossweb</artifactId>
     </dependency>
     <!-- end jboss deps -->