[jboss-cvs] JBossAS SVN: r78521 - in projects/ejb3/trunk: core and 1 other directory.

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

Author: wolfc
Date: 2008-09-15 03:20:25 -0400 (Mon, 15 Sep 2008)
New Revision: 78521

Modified:
   projects/ejb3/trunk/build/pom.xml
   projects/ejb3/trunk/core/pom.xml
Log:
EJBTHREE-1488: banned org.jboss.microcontainer:jboss-deployers-core-spi and using JBoss AS 5.0 CR1 artifacts


Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml	2008-09-15 06:56:27 UTC (rev 78520)
+++ projects/ejb3/trunk/build/pom.xml	2008-09-15 07:20:25 UTC (rev 78521)
@@ -108,8 +108,8 @@
     <version.junit_junit>4.4</version.junit_junit>
     <version.org.jboss.aop_jboss-aop>2.0.0.CR15</version.org.jboss.aop_jboss-aop>
     <version.org.jboss.aop_jboss-aop-aspects>2.0.0.CR7</version.org.jboss.aop_jboss-aop-aspects>
+    <version.org.jboss.deployers-deployers-core-spi>2.0.0.CR1</version.org.jboss.deployers-deployers-core-spi>
     <version.org.jboss.microcontainer_jboss-container>2.0.0.Beta10</version.org.jboss.microcontainer_jboss-container>
-    <version.org.jboss.microcontainer_jboss-deployers-core-spi>2.0.0.Beta10</version.org.jboss.microcontainer_jboss-deployers-core-spi>
     <version.org.jboss.microcontainer_jboss-kernel>2.0.0.Beta17</version.org.jboss.microcontainer_jboss-kernel>
     <version.org.jboss.ws_jbossws-spi>1.0.3.GA</version.org.jboss.ws_jbossws-spi>
    
@@ -163,6 +163,8 @@
                 <exclude>org.jboss:jboss-metadata</exclude>
                 <!-- deprecated, split up into multiple components -->
                 <exclude>org.jboss.microcontainer:jboss-container</exclude>
+                <!-- deprecated, should be org.jboss.deployers:jboss-deployers-core-spi -->
+                <exclude>org.jboss.microcontainer:jboss-deployers-core-spi</exclude>
                 <!-- deprecated, should be org.jboss.deployers:jboss-deployers-impl -->
                 <exclude>org.jboss.microcontainer:jboss-deployers-impl</exclude>
                 <!-- deprecated, should be org.jboss.deployers:jboss-deployers-spi -->
@@ -437,9 +439,9 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.microcontainer</groupId>
+        <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-core-spi</artifactId>
-        <version>${version.org.jboss.microcontainer_jboss-deployers-core-spi}</version>
+        <version>${version.org.jboss.deployers-deployers-core-spi}</version>
       </dependency>
 
        <dependency>

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-09-15 06:56:27 UTC (rev 78520)
+++ projects/ejb3/trunk/core/pom.xml	2008-09-15 07:20:25 UTC (rev 78521)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.0-Beta1</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
 
@@ -41,7 +41,7 @@
   <!-- Properties -->
 
   <properties>
-    <version.org.jboss.jboss-as>5.0.0.Beta4</version.org.jboss.jboss-as>
+    <version.org.jboss.jboss-as>5.0.0.CR1</version.org.jboss.jboss-as>
   </properties>
 
   <!-- Build Information -->
@@ -392,6 +392,12 @@
       <artifactId>jboss-embedded</artifactId>
       <version>beta3</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.microcontainer</groupId>
+          <artifactId>jboss-deployers-core-spi</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     
     <dependency>
@@ -536,7 +542,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
+      <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-core-spi</artifactId>
     </dependency>