[jboss-cvs] JBossAS SVN: r69866 - in trunk: build and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Feb 15 17:08:04 EST 2008


Author: pgier
Date: 2008-02-15 17:08:04 -0500 (Fri, 15 Feb 2008)
New Revision: 69866

Modified:
   trunk/build/pom.xml
   trunk/ejb3/pom.xml
   trunk/embedded/pom.xml
   trunk/pom.xml
Log:
Update EJB dependencies, and minor pom cleanup.

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2008-02-15 18:42:17 UTC (rev 69865)
+++ trunk/build/pom.xml	2008-02-15 22:08:04 UTC (rev 69866)
@@ -8,7 +8,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.jbossas</groupId>
   <artifactId>jboss-as-build</artifactId>
-	<version>5.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JBoss Application Server Distribution</name>
   <url>http://www.jboss.com/products/jbossas</url>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2008-02-15 18:42:17 UTC (rev 69865)
+++ trunk/ejb3/pom.xml	2008-02-15 22:08:04 UTC (rev 69866)
@@ -1,29 +1,28 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossas</groupId>
-		<artifactId>jboss-as-parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossas</groupId>
-	<artifactId>jboss-as-ejb3</artifactId>
-	<packaging>jar</packaging>
-	<name>JBoss Application Server EJB3</name>
-	<url>http://www.jboss.com/products/jbossas</url>
-	<description>JBoss Application Server (ejb3 module)</description>
-	<build>
-		<sourceDirectory>src/main</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>src/resources</directory>
-			</resource>
-		</resources>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.jboss.jbossas</groupId>
+    <artifactId>jboss-as-parent</artifactId>
+    <version>5.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.jbossas</groupId>
+  <artifactId>jboss-as-ejb3</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Application Server EJB3</name>
+  <url>http://www.jboss.com/products/jbossas</url>
+  <description>JBoss Application Server (ejb3 module)</description>
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
     <plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
             <id>assembly</id>
@@ -36,278 +35,269 @@
         <configuration>
           <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
         </configuration>
-			</plugin>
+      </plugin>
     </plugins>
-	</build>
-	<dependencies>
-		<!-- Compile (global dependencies) -->
-		<dependency>
-			<groupId>apache-xerces</groupId>
-			<artifactId>xml-apis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>hibernate</groupId>
-			<artifactId>hibernate3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>hibernate-annotations</groupId>
-			<artifactId>hibernate-annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jacorb</groupId>
-			<artifactId>jacorb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.security</groupId>
-			<artifactId>jaas</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-common-logging-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-remoting</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-serialization</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>jboss</groupId>
-					<artifactId>jboss-logging-log4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>jboss.jbossws</groupId>
-			<artifactId>jboss-jaxws</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>ejb3-persistence</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-classloading-spi</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>jboss</groupId>
-					<artifactId>jboss-common-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-common-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-corba-ots-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-ejb3-cache</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-metadata</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-transaction-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jboss-vfs</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>jboss</groupId>
-					<artifactId>jboss-common-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jbossws-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss</groupId>
-			<artifactId>jbossxb</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>jboss</groupId>
-					<artifactId>jboss-common-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.aop</groupId>
-			<artifactId>jboss-aop</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>jboss</groupId>
-					<artifactId>jboss-common-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.cache</groupId>
-			<artifactId>jbosscache-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.cluster</groupId>
-			<artifactId>jboss-ha-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.cluster</groupId>
-			<artifactId>jboss-ha-server-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.ejb3</groupId>
-			<artifactId>jboss-ejb3-ext-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.ejb3</groupId>
-			<artifactId>jboss-ejb3-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.javaee</groupId>
-			<artifactId>jboss-ejb-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.javaee</groupId>
-			<artifactId>jboss-jacc-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.javaee</groupId>
-			<artifactId>jboss-jca-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.javaee</groupId>
-			<artifactId>jboss-jms-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.javaee</groupId>
-			<artifactId>jboss-servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-aspects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-connector</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-iiop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-j2se</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-main</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-mbeans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-naming</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-system</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossas</groupId>
-			<artifactId>jboss-as-system-jmx</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-container</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-dependency</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-deployers-core-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-deployers-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-deployers-structure-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-deployers-vfs-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.microcontainer</groupId>
-			<artifactId>jboss-kernel</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.security</groupId>
-			<artifactId>authorization-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.security</groupId>
-			<artifactId>jboss-security-spi-bare</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.security</groupId>
-			<artifactId>jbosssx-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>oswego-concurrent</groupId>
-			<artifactId>concurrent</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>quartz</groupId>
-			<artifactId>quartz</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>trove</groupId>
-			<artifactId>trove</artifactId>
-		</dependency>
-	</dependencies>
-	
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>apache-xerces</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>hibernate</groupId>
+      <artifactId>hibernate3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>hibernate-annotations</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>jacorb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.security</groupId>
+      <artifactId>jaas</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-common-logging-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-remoting</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-serialization</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossws</groupId>
+      <artifactId>jboss-jaxws</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>javassist</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-classloading-spi</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-corba-ots-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-transaction-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-vfs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jbossws-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jbossxb</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.cluster</groupId>
+      <artifactId>jboss-ha-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.cluster</groupId>
+      <artifactId>jboss-ha-server-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-cache</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-ext-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-interceptors</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-ejb-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-jms-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-persistence-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-aspects</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-iiop</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-j2se</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-main</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-mbeans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-naming</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-system</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-system-jmx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-container</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-dependency</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-deployers-core-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-deployers-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-deployers-structure-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-deployers-vfs-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-kernel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>authorization-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jboss-security-spi-bare</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jbosssx-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>oswego-concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>quartz</groupId>
+      <artifactId>quartz</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>trove</groupId>
+      <artifactId>trove</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2008-02-15 18:42:17 UTC (rev 69865)
+++ trunk/embedded/pom.xml	2008-02-15 22:08:04 UTC (rev 69866)
@@ -34,10 +34,10 @@
 		<!-- Compile (global dependencies) -->
 		<dependency>
 			<groupId>org.jboss.security</groupId>
-   			<artifactId>jboss-security-spi</artifactId>
+   	  <artifactId>jboss-security-spi</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss</groupId>
+			<groupId>org.jboss.ejb3</groupId>
 			<artifactId>jboss-ejb3-cache</artifactId>
 		</dependency>
 		<dependency>
@@ -71,7 +71,6 @@
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
-			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-02-15 18:42:17 UTC (rev 69865)
+++ trunk/pom.xml	2008-02-15 22:08:04 UTC (rev 69866)
@@ -63,6 +63,7 @@
     <version.org.jboss.microcontainer>2.0.0-SNAPSHOT</version.org.jboss.microcontainer>
 		<version.org.jboss.security>2.0.2.Beta4</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss</version.oswego-concurrent.concurrent>
+    <version.suffix.org.jboss.javaee>-SNAPSHOT</version.suffix.org.jboss.javaee>
   </properties>
 
 	<build>
@@ -332,11 +333,6 @@
 			</dependency>
 			<dependency>
 				<groupId>jboss</groupId>
-				<artifactId>jboss-jca-api</artifactId>
-				<version>1.5-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>jboss</groupId>
 				<artifactId>jboss-j2ee</artifactId>
 				<version>4.0.2</version>
 			</dependency>
@@ -515,11 +511,6 @@
 			</dependency>
 			<dependency>
 				<groupId>org.jboss</groupId>
-				<artifactId>jboss-ejb3-cache</artifactId>
-				<version>0.11.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss</groupId>
 				<artifactId>jboss-metadata</artifactId>
 				<version>1.0.0-SNAPSHOT</version>
 			</dependency>
@@ -599,6 +590,11 @@
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.ejb3</groupId>
+				<artifactId>jboss-ejb3-cache</artifactId>
+				<version>0.13.0-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.jboss.ejb3</groupId>
 				<artifactId>jboss-ejb3-ext-api</artifactId>
 				<version>0.1.2.Beta1</version>
 			</dependency>
@@ -607,45 +603,55 @@
 				<artifactId>jboss-ejb3-impl</artifactId>
 				<version>0.1.2.Beta1</version>
 			</dependency>
+      <dependency>
+        <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-metadata</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-interceptors</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
+      </dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-ejb-api</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>3.0.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-jacc-api</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-jad-api</artifactId>
-				<version>1.2.0-SNAPSHOT</version>
+				<version>1.2.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-jaspi-api</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
+				<version>1.0.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-jca-api</artifactId>
-				<version>1.5.0-SNAPSHOT</version>
+				<version>1.5.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-jms-api</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-persistence-api</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>3.0.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.javaee</groupId>
 				<artifactId>jboss-servlet-api</artifactId>
-				<version>2.5.0-SNAPSHOT</version>
+				<version>2.5.0${version.suffix.org.jboss.javaee}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.jbossas</groupId>




More information about the jboss-cvs-commits mailing list