[jboss-cvs] JBossAS SVN: r71095 - in trunk: bootstrap and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Mar 20 15:24:28 EDT 2008


Author: pgier
Date: 2008-03-20 15:24:28 -0400 (Thu, 20 Mar 2008)
New Revision: 71095

Modified:
   trunk/bootstrap/pom.xml
   trunk/connector/pom.xml
   trunk/ejb3/pom.xml
   trunk/embedded/pom.xml
   trunk/j2se/pom.xml
   trunk/pom.xml
   trunk/profileservice/pom.xml
   trunk/spring-int/pom.xml
   trunk/system-jmx/pom.xml
   trunk/system/pom.xml
   trunk/thirdparty/pom.xml
   trunk/tomcat/pom.xml
   trunk/varia/pom.xml
   trunk/webservices/pom.xml
Log:
Several pom updates related to the new component-matrix parent, and using the new groupIds for managed and deployers.

Modified: trunk/bootstrap/pom.xml
===================================================================
--- trunk/bootstrap/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/bootstrap/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -27,6 +27,10 @@
       <artifactId>jboss-as-main</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>

Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/connector/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -119,11 +119,11 @@
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
@@ -131,18 +131,18 @@
       <artifactId>jboss-as-main</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-deployers-core-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-metatype</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.deployers</groupId>
+      <artifactId>jboss-deployers-core-spi</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
     </dependency>
@@ -163,7 +163,7 @@
       <artifactId>concurrent</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/ejb3/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -128,19 +128,19 @@
       <artifactId>jboss-as-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/embedded/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -173,7 +173,7 @@
       <artifactId>concurrent</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/j2se/pom.xml
===================================================================
--- trunk/j2se/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/j2se/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -26,7 +26,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.3</version>
         <configuration>
-          <testFailureIgnore>true</testFailureIgnore>
+          <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -14,7 +14,9 @@
   <url>http://www.jboss.com/products/jbossas</url>
   <description>JBoss Application Server (aggregator)</description>
   
-  <!-- Require Maven 2.0.8 -->
+  <!-- Maven 2.0.8 or higher must be used to build this project because of
+  -  a bug in earlier versions when handling inter-module test scope dependencies.
+  -->
   <prerequisites>
     <maven>2.0.8</maven>
   </prerequisites>
@@ -64,4 +66,68 @@
     <module>build</module>
   </modules>
 
+  <!-- Repositories -->
+  <repositories>
+    <repository>
+      <id>repository.jboss.org</id>
+      <name>JBoss Releases Repository</name>
+      <url>http://repository.jboss.org/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>snapshots.jboss.org</id>
+      <name>JBoss Snapshots Repository</name>
+      <url>http://snapshots.jboss.org/maven2</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <!-- Plugin Repositories -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>repository.jboss.org</id>
+      <name>JBoss Plugin Releases</name>
+      <url>http://repository.jboss.org/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>snapshots.jboss.org</id>
+      <name>JBoss Plugin Snapshots</name>
+      <url>http://snapshots.jboss.org/maven2</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <!-- Note: this repository can be removed once the jboss-packaging plugin is released -->
+    <pluginRepository>
+      <id>codehaus.org</id>
+      <name>CodeHaus Plugin Snapshots</name>
+      <url>http://snapshots.repository.codehaus.org</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+  
 </project>

Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/profileservice/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -30,7 +30,7 @@
       <artifactId>jboss-as-aspects</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
     </dependency>
     <dependency>
@@ -44,12 +44,6 @@
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-system-jmx</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.microcontainer</groupId>
-          <artifactId>jboss-managed</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
@@ -61,7 +55,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
     </dependency>
     <dependency>
@@ -69,7 +63,7 @@
       <artifactId>jboss-remoting</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-metatype</artifactId>
     </dependency>
     <dependency>
@@ -81,7 +75,7 @@
       <artifactId>jboss-aop</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
@@ -89,15 +83,15 @@
       <artifactId>xml-apis</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-client-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
   </dependencies>

Modified: trunk/spring-int/pom.xml
===================================================================
--- trunk/spring-int/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/spring-int/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -18,7 +18,7 @@
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
       <exclusions>
         <exclusion>
@@ -56,15 +56,15 @@
       <artifactId>jboss-dependency</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs</artifactId>
     </dependency>
     <dependency>
@@ -72,7 +72,7 @@
       <artifactId>jboss-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/system/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -36,7 +36,7 @@
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
       <exclusions>
         <exclusion>
@@ -58,6 +58,14 @@
       <artifactId>jboss-common-logging-spi</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-metatype</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-container</artifactId>
     </dependency>
@@ -66,35 +74,27 @@
       <artifactId>jboss-dependency</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-client-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-managed</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-metatype</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-impl</artifactId>
     </dependency>
     <dependency>

Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/system-jmx/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -36,48 +36,52 @@
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-deployers-vfs-spi</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-vfs</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>apache-xerces</groupId>
       <artifactId>xml-apis</artifactId>
     </dependency>
     <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-common-logging-spi</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss</groupId>
-      <artifactId>jbossxb</artifactId>
+      <artifactId>jboss-common-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-logging-spi</artifactId>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-vfs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-deployers-core-spi</artifactId>
+      <groupId>org.jboss</groupId>
+      <artifactId>jbossxb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-kernel</artifactId>
+      <groupId>org.jboss.deployers</groupId>
+      <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.deployers</groupId>
+      <artifactId>jboss-deployers-vfs-spi</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-vfs</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-j2se</artifactId>
     </dependency>
@@ -94,12 +98,12 @@
       <artifactId>jboss-as-jmx</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-vfs</artifactId>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-dependency</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-kernel</artifactId>
     </dependency>
   </dependencies>
   

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/thirdparty/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -54,13 +54,6 @@
         <configuration>
           <mappedDependencies>
             <dependency>
-              <groupId>apache-slide</groupId>
-              <artifactId>webdavlib</artifactId>
-              <mapping>
-                <artifactId>jakarta-slide-webdavlib</artifactId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>org.beanshell</groupId>
               <artifactId>bsh</artifactId>
               <mapping>
@@ -75,13 +68,6 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>commons-logging</groupId>
-              <artifactId>commons-logging</artifactId>
-              <mapping>
-                <componentId>apache-logging</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>commons-codec</groupId>
               <artifactId>commons-codec</artifactId>
               <mapping>
@@ -130,34 +116,13 @@
                 <componentId>sun-jsf</componentId>
               </mapping>
             </dependency>
-            
             <dependency>
-              <groupId>myfaces</groupId>
-              <artifactId>myfaces-impl</artifactId>
-              <mapping>
-                <componentId>apache-myfaces</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>myfaces</groupId>
-              <artifactId>myfaces-api</artifactId>
-              <mapping>
-                <componentId>apache-myfaces</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>apache-myfaces</groupId>
-              <artifactId>jstl</artifactId>
-            </dependency>
-            
-            <dependency>
               <groupId>jfree</groupId>
               <artifactId>jfreechart</artifactId>
               <mapping>
                 <componentId>jfreechart</componentId>
               </mapping>
             </dependency>
-            
             <dependency>
               <groupId>org.apache.maven</groupId>
               <artifactId>maven-ant-tasks</artifactId>
@@ -558,56 +523,56 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-client</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-client-spi</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-core-spi</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-impl</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-spi</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-structure-spi</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-vfs</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.deployers</groupId>
               <artifactId>jboss-deployers-vfs-spi</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
@@ -621,14 +586,14 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.man</groupId>
               <artifactId>jboss-managed</artifactId>
               <mapping>
                 <componentId>jboss.jboss-managed</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.microcontainer</groupId>
+              <groupId>org.jboss.man</groupId>
               <artifactId>jboss-metatype</artifactId>
               <mapping>
                 <componentId>jboss.microcontainer</componentId>
@@ -698,13 +663,6 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss</groupId>
-              <artifactId>javassist</artifactId>
-              <mapping>
-                <componentId>javassist</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>stax</groupId>
               <artifactId>stax-api</artifactId>
               <mapping>
@@ -791,7 +749,7 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
+      <groupId>apache-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
@@ -800,11 +758,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>myfaces</groupId>
+      <groupId>apache-myfaces</groupId>
       <artifactId>myfaces-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>myfaces</groupId>
+      <groupId>apache-myfaces</groupId>
       <artifactId>myfaces-api</artifactId>
     </dependency>
     <dependency>
@@ -817,7 +775,7 @@
     </dependency>
     <dependency>
       <groupId>apache-slide</groupId>
-      <artifactId>webdavlib</artifactId>
+      <artifactId>jakarta-slide-webdavlib</artifactId>
     </dependency>
     <dependency>
       <groupId>apache-velocity</groupId>
@@ -929,6 +887,30 @@
       <classifier>client</classifier>
     </dependency>
     <dependency>
+      <groupId>jboss.jms-integration-tests</groupId>
+      <artifactId>integration-mdb20</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jms-integration-tests</groupId>
+      <artifactId>integration-mdb20-durable</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jms-integration-tests</groupId>
+      <artifactId>integration-mdb20-selector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jms-integration-tests</groupId>
+      <artifactId>integration-mdb20-userTransaction</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jms-integration-tests</groupId>
+      <artifactId>integration-mdb20-userTransactionDups</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jms-integration-tests</groupId>
+      <artifactId>jms-integration-tests</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
     </dependency>
@@ -959,13 +941,21 @@
     </dependency>
     <dependency>
       <groupId>jacorb</groupId>
+      <artifactId>idl_g</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
       <artifactId>jacorb</artifactId>
     </dependency>
     <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>jacorb_g</artifactId>
+    </dependency>
+    <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossjta</artifactId>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossjta-integration</artifactId>
     </dependency>
@@ -983,7 +973,7 @@
       <type>jboss-sar</type>
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
+      <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
     </dependency>
     <dependency>
@@ -1212,35 +1202,35 @@
       <artifactId>jboss-dependency</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-client-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
     </dependency>
     <dependency>
@@ -1248,11 +1238,11 @@
       <artifactId>jboss-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.man</groupId>
       <artifactId>jboss-metatype</artifactId>
     </dependency>
     <dependency>
@@ -1260,7 +1250,7 @@
       <artifactId>jboss-profiler-jvmti</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
+      <groupId>jboss.remoting</groupId>
       <artifactId>jboss-remoting</artifactId>
     </dependency>
     <dependency>
@@ -1422,7 +1412,7 @@
     </dependency>-->
     <dependency>
       <groupId>sun-opends</groupId>
-      <artifactId>opends-core</artifactId>
+      <artifactId>OpenDS</artifactId>
     </dependency>
     <dependency>
       <groupId>sun-jaxws</groupId>
@@ -1465,6 +1455,10 @@
       <artifactId>snmpTrapAppender</artifactId>
     </dependency>
     <dependency>
+      <groupId>sun-javamail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+    <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xdoclet</artifactId>
     </dependency>

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/tomcat/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -220,27 +220,27 @@
       <artifactId>jboss-classloader</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/varia/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -132,15 +132,15 @@
       <artifactId>jboss-kernel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs</artifactId>
     </dependency>
     <dependency>

Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml	2008-03-20 19:07:50 UTC (rev 71094)
+++ trunk/webservices/pom.xml	2008-03-20 19:24:28 UTC (rev 71095)
@@ -98,19 +98,19 @@
       <artifactId>jbossws-framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-structure-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-client-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>
     <dependency>
@@ -130,7 +130,7 @@
       <artifactId>jbosssx-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-vfs-spi</artifactId>
     </dependency>
     <dependency>




More information about the jboss-cvs-commits mailing list