[jboss-cvs] JBossAS SVN: r73864 - in trunk: component-matrix and 11 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 30 14:50:51 EDT 2008


Author: pgier
Date: 2008-05-30 14:50:50 -0400 (Fri, 30 May 2008)
New Revision: 73864

Modified:
   trunk/aspects/pom.xml
   trunk/component-matrix/pom.xml
   trunk/connector/pom.xml
   trunk/deployment/pom.xml
   trunk/embedded/pom.xml
   trunk/hibernate-int/pom.xml
   trunk/iiop/pom.xml
   trunk/j2se/pom.xml
   trunk/jbossmq/pom.xml
   trunk/jmx/pom.xml
   trunk/server/pom.xml
   trunk/thirdparty/pom.xml
   trunk/varia/pom.xml
Log:
[JBAS-5288] Revert integration module back to 5.0.0.Beta4 until ejb3 interface issue can be worked out.

Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/aspects/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -116,7 +116,7 @@
       <artifactId>jta</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>    
     <dependency>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/component-matrix/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -43,7 +43,7 @@
     <version.org.jboss.cl>2.0.0.Beta12</version.org.jboss.cl>
     <version.org.jboss.cluster>1.1.0.Beta2</version.org.jboss.cluster>
     <version.org.jboss.deployers>2.0.0.Beta15</version.org.jboss.deployers>
-    <version.org.jboss.integration>5.0.0.CR1</version.org.jboss.integration>
+    <version.org.jboss.integration>5.0.0.Beta4</version.org.jboss.integration>
     <version.org.jboss.man>2.0.0.Beta13</version.org.jboss.man>
     <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer>
     <version.org.jboss.security>2.0.2.CR2</version.org.jboss.security>
@@ -1019,19 +1019,19 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.integration</groupId>
-        <artifactId>jboss-classloading-spi</artifactId>
-        <version>${version.org.jboss.integration}</version>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-common-core</artifactId>
+        <version>2.2.5.GA</version>
       </dependency>
       
       <dependency>
         <groupId>org.jboss</groupId>
-        <artifactId>jboss-common-core</artifactId>
-        <version>2.2.5.GA</version>
+        <artifactId>jboss-classloading-spi</artifactId>
+        <version>${version.org.jboss.integration}</version>
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.integration</groupId>
+        <groupId>org.jboss</groupId>
         <artifactId>jboss-corba-ots-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
@@ -1039,7 +1039,7 @@
       <!-- Combined integration jar.  Maybe this can be removed when we just use the 
         -  individual compoennts -->
       <dependency>
-        <groupId>org.jboss.integration</groupId>
+        <groupId>org.jboss</groupId>
         <artifactId>jboss-integration</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
@@ -1075,7 +1075,7 @@
       </dependency>    
       
       <dependency>
-        <groupId>org.jboss.integration</groupId>
+        <groupId>org.jboss</groupId>
         <artifactId>jboss-transaction-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>

Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/connector/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -111,7 +111,7 @@
       <artifactId>jboss-vfs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/deployment/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -108,7 +108,7 @@
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/embedded/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -121,7 +121,7 @@
       <artifactId>jboss-reflect</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/hibernate-int/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -64,7 +64,7 @@
       <artifactId>jta</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
   </dependencies>

Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/iiop/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -136,17 +136,17 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-classloading-spi</artifactId>
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-corba-ots-spi</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
       <exclusions>
         <exclusion>

Modified: trunk/j2se/pom.xml
===================================================================
--- trunk/j2se/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/j2se/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -74,7 +74,7 @@
       <artifactId>dom4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-classloading-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/jbossmq/pom.xml
===================================================================
--- trunk/jbossmq/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/jbossmq/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -98,7 +98,7 @@
       <artifactId>jboss-as-j2se</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/jmx/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -53,7 +53,7 @@
       <artifactId>jboss-common-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-classloading-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/server/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -172,7 +172,7 @@
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/thirdparty/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -320,30 +320,37 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.integration</groupId>
+              <groupId>org.jboss</groupId>
               <artifactId>jboss-classloading-spi</artifactId>
               <mapping>
                 <componentId>jboss.integration</componentId>
               </mapping>
-            </dependency>
+            </dependency>-->
             <!-- Combined integration jar.  Maybe this can be removed when we just use the 
             -  individual compoennts -->
             <dependency>
-              <groupId>org.jboss.integration</groupId>
+              <groupId>org.jboss</groupId>
               <artifactId>jboss-integration</artifactId>
               <mapping>
                 <componentId>jboss.integration</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.integration</groupId>
+              <groupId>org.jboss</groupId>
+              <artifactId>jboss-deployment-spi</artifactId>
+              <mapping>
+                <componentId>jboss.integration</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss</groupId>
               <artifactId>jboss-corba-ots-spi</artifactId>
               <mapping>
                 <componentId>jboss.integration</componentId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.integration</groupId>
+              <groupId>org.jboss</groupId>
               <artifactId>jboss-transaction-spi</artifactId>
               <mapping>
                 <componentId>jboss.integration</componentId>
@@ -356,7 +363,7 @@
               <mapping>
                 <componentId>jboss.aop</componentId>
               </mapping>
-            </dependency>
+            </dependency>-->
             <dependency>
               <groupId>org.jboss.aop</groupId>
               <artifactId>jboss-aop-deployer-jdk50</artifactId>
@@ -1242,7 +1249,7 @@
     <!-- Combined integration jar.  Maybe this can be removed when we just use the 
     -  individual compoennts -->    
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-integration</artifactId>
     </dependency>
     <dependency>
@@ -1270,15 +1277,15 @@
       <artifactId>jboss-logging-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-classloading-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-corba-ots-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <dependency>

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2008-05-30 18:41:25 UTC (rev 73863)
+++ trunk/varia/pom.xml	2008-05-30 18:50:50 UTC (rev 73864)
@@ -167,7 +167,7 @@
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.integration</groupId>
+      <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     




More information about the jboss-cvs-commits mailing list