[jboss-cvs] JBossAS SVN: r71593 - in projects/ejb3/trunk: cache and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 2 08:47:20 EDT 2008
Author: wolfc
Date: 2008-04-02 08:47:20 -0400 (Wed, 02 Apr 2008)
New Revision: 71593
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/cache/pom.xml
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/ext-api-impl/pom.xml
projects/ejb3/trunk/interceptors/pom.xml
projects/ejb3/trunk/locator/pom.xml
projects/ejb3/trunk/metadata/pom.xml
projects/ejb3/trunk/sandbox/pom.xml
Log:
EJBTHREE-1220: reworked dependencies
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/build/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -2,9 +2,9 @@
<!-- Parent -->
<parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
</parent>
<!-- POM Model Version -->
@@ -81,20 +81,6 @@
-->
- <!--
-
- Internal
-
- -->
-
- <version.org.jboss.ejb3_jboss-ejb3-cache>0.13.0-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-cache>
- <version.org.jboss.ejb3_jboss-ejb3-core>0.1.0-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-core>
- <version.org.jboss.ejb3_jboss-ejb3-ext-api>0.3-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-ext-api>
- <version.org.jboss.ejb3_jboss-ejb3-ext-api-impl>0.3-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-ext-api-impl>
- <version.org.jboss.ejb3_jboss-ejb3-interceptors>0.12.0-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-interceptors>
- <version.org.jboss.ejb3_jboss-ejb3-metadata>0.12.0-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-metadata>
- <version.org.jboss.ejb3_jboss-ejb3-pool>0.13.0-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-pool>
-
<!--
External
@@ -104,11 +90,8 @@
<version.ant_ant>1.6.5</version.ant_ant>
<version.commons-validator_commons-validator>1.3.1</version.commons-validator_commons-validator>
<version.junit_junit>4.4</version.junit_junit>
- <version.org.jboss_jboss-test>1.0.6-SNAPSHOT</version.org.jboss_jboss-test>
<version.org.jboss.aop_jboss-aop>2.0.0.CR7</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.jbossas_jboss-as>5.0.0-SNAPSHOT</version.org.jboss.jbossas_jboss-as>
- <version.org.jboss.embedded_jboss-embedded>beta3-SNAPSHOT</version.org.jboss.embedded_jboss-embedded>
<version.org.jboss.microcontainer_jboss-container>2.0.0.Beta9</version.org.jboss.microcontainer_jboss-container>
<version.org.jboss.microcontainer_jboss-deployers-core-spi>2.0.0.Beta9</version.org.jboss.microcontainer_jboss-deployers-core-spi>
<version.org.jboss.microcontainer_jboss-kernel>2.0.0.Beta9</version.org.jboss.microcontainer_jboss-kernel>
@@ -241,64 +224,53 @@
<!--
- Internal
+ External
-->
-
- <!-- EJB3 Core -->
+
+ <!-- Apache Commons Validator -->
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-core}</version>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>${version.commons-validator_commons-validator}</version>
</dependency>
- <!-- EJB3 External API -->
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>2.0.2.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.2.GA</version>
+ </dependency>
+
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-ext-api}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.4.GA</version>
</dependency>
- <!-- EJB3 External API Implementation Classes -->
+
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api-impl</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-ext-api-impl}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>1.0.0.Beta6</version>
</dependency>
- <!-- EJB3 Interceptors -->
+
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-interceptors</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-interceptors}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>5.0.0.Beta4</version>
</dependency>
- <!-- EJB3 MetaData bridge -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-metadata</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-metadata}</version>
- </dependency>
- <!-- EJB3 Pool -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-pool</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-pool}</version>
- </dependency>
- <!-- EJB3 Cache -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-cache</artifactId>
- <version>${version.org.jboss.ejb3_jboss-ejb3-cache}</version>
- </dependency>
-
- <!--
-
- External
-
- -->
- <!-- Apache Commons Validator -->
<dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>${version.commons-validator_commons-validator}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>5.0.0.Beta4</version>
+ <scope>test</scope>
</dependency>
<!-- JBoss AOP -->
@@ -315,34 +287,30 @@
<version>${version.org.jboss.aop_jboss-aop-aspects}</version>
</dependency>
- <!-- JBoss AS Aspects -->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>${version.org.jboss.jbossas_jboss-as}</version>
- </dependency>
-
- <!-- JBoss AS Connector -->
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>3.0.0.Beta3Update1</version>
+ </dependency>
+
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <version>${version.org.jboss.jbossas_jboss-as}</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ <version>1.1.0.Beta3Update1</version>
</dependency>
- <!-- JBoss Embedded -->
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded</artifactId>
- <version>${version.org.jboss.embedded_jboss-embedded}</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ <version>1.5.0.Beta3Update1</version>
</dependency>
-
- <!-- JBoss AS IIOP -->
+
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- <version>${version.org.jboss.jbossas_jboss-as}</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-persistence-api</artifactId>
+ <version>3.0.0.Beta3Update1</version>
</dependency>
-
+
<!-- JBoss Microcontainer -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -370,7 +338,8 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>${version.org.jboss_jboss-test}</version>
+ <version>1.0.5.GA</version>
+ <!-- TODO: was 1.0.6-SNAPSHOT -->
</dependency>
<!-- JUnit -->
@@ -381,6 +350,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: projects/ejb3/trunk/cache/pom.xml
===================================================================
--- projects/ejb3/trunk/cache/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/cache/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -51,7 +51,7 @@
<!-- JBoss Common Logging -->
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
+ <artifactId>jboss-logging-log4j</artifactId>
<scope>runtime</scope>
</dependency>
@@ -59,6 +59,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
+ <version>1.0.3.GA</version>
</dependency>
<!-- JUnit -->
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/core/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -28,7 +28,7 @@
<!-- Properties -->
<properties>
-
+ <version.org.jboss.jboss-as>5.0.0-SNAPSHOT</version.org.jboss.jboss-as>
</properties>
<!-- Build Information -->
@@ -183,8 +183,8 @@
<artifactId>jboss-test</artifactId>
</artifactItem>
<artifactItem>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
</artifactItem>
<artifactItem>
<groupId>hsqldb</groupId>
@@ -205,10 +205,6 @@
<version>1.2</version><!-- Used only here -->
</artifactItem>
<artifactItem>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- </artifactItem>
- <artifactItem>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
</artifactItem>
@@ -268,17 +264,26 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>ejb3-persistence</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.6.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
+ <version>3.3.1.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -318,30 +323,42 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-client</artifactId>
+ <version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-api</artifactId>
+ <version>1.0.0.GA</version>
</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.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api-impl</artifactId>
+ <version>0.3-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.ejb3</groupId>
+ <artifactId>jboss-ejb3-metadata</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
+ <version>beta3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -369,14 +386,17 @@
<artifactId>jboss-as-cluster</artifactId>
</exclusion>
</exclusions>
+ <version>${version.org.jboss.jboss-as}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-connector</artifactId>
+ <version>${version.org.jboss.jboss-as}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-iiop</artifactId>
+ <version>${version.org.jboss.jboss-as}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -404,10 +424,12 @@
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi-bare</artifactId>
+ <version>2.0.2.Beta5</version>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
+ <version>2.0.2.Beta5</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -416,6 +438,7 @@
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>trove</groupId>
Modified: projects/ejb3/trunk/ext-api-impl/pom.xml
===================================================================
--- projects/ejb3/trunk/ext-api-impl/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/ext-api-impl/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -41,6 +41,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
@@ -48,4 +49,4 @@
<artifactId>jboss-ejb-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/ejb3/trunk/interceptors/pom.xml
===================================================================
--- projects/ejb3/trunk/interceptors/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/interceptors/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -43,6 +43,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metadata</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- External -->
@@ -52,7 +53,7 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
+ <artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/locator/pom.xml
===================================================================
--- projects/ejb3/trunk/locator/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/locator/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -46,6 +46,7 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
+ <version>1.8</version>
</dependency>
<!-- JUnit -->
Modified: projects/ejb3/trunk/metadata/pom.xml
===================================================================
--- projects/ejb3/trunk/metadata/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/metadata/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -25,11 +25,13 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api-impl</artifactId>
+ <version>0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -56,6 +58,15 @@
<scope>test</scope>
</dependency>
+ <!-- FIXME: broken JaxB dependency -->
+ <!--
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ -->
+
<!-- TODO: javassist -->
</dependencies>
</project>
Modified: projects/ejb3/trunk/sandbox/pom.xml
===================================================================
--- projects/ejb3/trunk/sandbox/pom.xml 2008-04-02 12:33:45 UTC (rev 71592)
+++ projects/ejb3/trunk/sandbox/pom.xml 2008-04-02 12:47:20 UTC (rev 71593)
@@ -49,6 +49,11 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jnpserver</artifactId>
<scope>test</scope>
</dependency>
More information about the jboss-cvs-commits
mailing list