[jboss-cvs] JBossAS SVN: r71216 - in projects/ejb3/trunk: core and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 24 20:37:42 EDT 2008
Author: ALRubinger
Date: 2008-03-24 20:37:42 -0400 (Mon, 24 Mar 2008)
New Revision: 71216
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/injection/pom.xml
projects/ejb3/trunk/interceptors/pom.xml
projects/ejb3/trunk/metadata/pom.xml
Log:
[EJBTHREE-1220] Strip versions defined in component-matrix from EJB3 Build POM
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2008-03-24 23:05:31 UTC (rev 71215)
+++ projects/ejb3/trunk/build/pom.xml 2008-03-25 00:37:42 UTC (rev 71216)
@@ -29,7 +29,7 @@
<roles>
<role>Project Lead</role>
</roles>
- <timezone>CET</timezone>
+ <timezone>+1</timezone>
</developer>
<developer>
<name>William DeCoste</name>
@@ -40,7 +40,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone>PST</timezone>
+ <timezone>-8</timezone>
</developer>
<developer>
<name>Andrew Lee Rubinger</name>
@@ -50,7 +50,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone>EST</timezone>
+ <timezone>-5</timezone>
</developer>
</developers>
@@ -102,43 +102,16 @@
-->
<version.ant_ant>1.6.5</version.ant_ant>
- <version.commons-digester_commons-digester>1.8</version.commons-digester_commons-digester>
<version.commons-validator_commons-validator>1.3.1</version.commons-validator_commons-validator>
- <version.jboss_jboss-common-logging-log4j>2.0.4.GA</version.jboss_jboss-common-logging-log4j>
- <version.jboss_jboss-logging-log4j>2.0.2.GA</version.jboss_jboss-logging-log4j>
- <version.jboss_jboss-logging-spi>2.0.2.GA</version.jboss_jboss-logging-spi>
- <version.jboss_jboss-serialization>1.0.3.GA</version.jboss_jboss-serialization>
- <version.jboss.remoting />
<version.junit_junit>4.4</version.junit_junit>
- <version.org.hibernate_ejb3-persistence>3.3.2.Beta1</version.org.hibernate_ejb3-persistence>
- <version.hibernate_hibernate3>3.2.r14201-1</version.hibernate_hibernate3>
- <version.hibernate-annotations_hibernate-annotations>3.3.0.GA</version.hibernate-annotations_hibernate-annotations>
- <version.hibernate-entitymanager_hibernate-entitymanager>3.3.1.GA</version.hibernate-entitymanager_hibernate-entitymanager>
- <version.org.jboss_jboss-common-core>2.2.1.GA</version.org.jboss_jboss-common-core>
- <version.org.jboss_jboss-metadata>1.0.0.Beta6</version.org.jboss_jboss-metadata>
- <version.org.jboss_jboss-transaction-spi>5.0.0.Beta4</version.org.jboss_jboss-transaction-spi>
<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.cluster_jboss-ha-client>1.0.0.GA</version.org.jboss.cluster_jboss-ha-client>
- <version.org.jboss.cluster_jboss-ha-server-api>1.0.0.GA</version.org.jboss.cluster_jboss-ha-server-api>
+ <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.javaee_jboss-ejb-api>3.0.0.Beta3Update1</version.org.jboss.javaee_jboss-ejb-api>
- <version.org.jboss.javaee_jboss-jacc-api>1.1.0.Beta3Update1</version.org.jboss.javaee_jboss-jacc-api>
- <version.org.jboss.javaee_jboss-jca-api>1.5.0.Beta3Update1</version.org.jboss.javaee_jboss-jca-api>
- <version.org.jboss.javaee_jboss-jms-api>1.1.0.Beta3Update1</version.org.jboss.javaee_jboss-jms-api>
- <version.org.jboss.javaee_jboss-persistence-api>3.0.0.Beta3Update1</version.org.jboss.javaee_jboss-persistence-api>
- <version.org.jboss.jbossas_jboss-as-aspects>5.0.0.Beta4</version.org.jboss.jbossas_jboss-as-aspects>
- <version.org.jboss.jbossas_jboss-as-connector>5.0.0.Beta4</version.org.jboss.jbossas_jboss-as-connector>
- <version.org.jboss.jbossas_jboss-as-iiop>5.0.0.Beta4</version.org.jboss.jbossas_jboss-as-iiop>
- <version.org.jboss_jnpserver>5.0.0.Beta4</version.org.jboss_jnpserver>
<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>
- <version.org.jboss.security_jboss-security-spi-bare>2.0.2.Beta5</version.org.jboss.security_jboss-security-spi-bare>
- <version.org.jboss.security_jbosssx-client>2.0.2.Beta5</version.org.jboss.security_jbosssx-client>
- <version.trove_trove>1.0.2</version.trove_trove>
- <version.quartz_quartz>1.6.0</version.quartz_quartz>
<!-- Miscellaneous -->
<jvmargs />
@@ -319,14 +292,7 @@
External
-->
-
- <!-- Apache Commons Digester -->
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${version.commons-digester_commons-digester}</version>
- </dependency>
-
+
<!-- Apache Commons Validator -->
<dependency>
<groupId>commons-validator</groupId>
@@ -334,104 +300,25 @@
<version>${version.commons-validator_commons-validator}</version>
</dependency>
- <!-- Apache Ant -->
+ <!-- JBoss AOP Aspects -->
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>${version.ant_ant}</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>${version.ant_ant}</version>
- </dependency>
-
- <!-- Hibernate -->
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <version>${version.hibernate_hibernate3}</version>
- </dependency>
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${version.hibernate-annotations_hibernate-annotations}</version>
- </dependency>
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${version.hibernate-entitymanager_hibernate-entitymanager}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- <version>${version.org.hibernate_ejb3-persistence}</version>
- </dependency>
-
- <!-- JavaEE EJB3 API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <version>${version.org.jboss.javaee_jboss-ejb-api}</version>
- </dependency>
-
- <!-- JavaEE JCA API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>${version.org.jboss.javaee_jboss-jca-api}</version>
- </dependency>
-
- <!-- JavaEE JCA API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- <version>${version.org.jboss.javaee_jboss-jms-api}</version>
- </dependency>
-
- <!-- JavaEE JACC API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- <version>${version.org.jboss.javaee_jboss-jacc-api}</version>
- </dependency>
-
- <!-- JavaEE JPA API -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-persistence-api</artifactId>
- <version>${version.org.jboss.javaee_jboss-persistence-api}</version>
- </dependency>
-
- <!-- JBoss AOP -->
- <dependency>
<groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.org.jboss.aop_jboss-aop}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-aspects</artifactId>
<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-aspects}</version>
- </dependency>
+ <version>${version.org.jboss.jbossas_jboss-as}</version>
+ </dependency>
- <!-- JBoss Common Core -->
+ <!-- JBoss AS Connector -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.org.jboss_jboss-common-core}</version>
- </dependency>
-
- <!-- JBoss Connector -->
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-connector</artifactId>
- <version>${version.org.jboss.jbossas_jboss-as-connector}</version>
+ <version>${version.org.jboss.jbossas_jboss-as}</version>
</dependency>
<!-- JBoss Embedded -->
@@ -441,59 +328,13 @@
<version>${version.org.jboss.embedded_jboss-embedded}</version>
</dependency>
- <!-- JBoss HA -->
+ <!-- JBoss AS IIOP -->
<dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-client</artifactId>
- <version>${version.org.jboss.cluster_jboss-ha-client}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-api</artifactId>
- <version>${version.org.jboss.cluster_jboss-ha-server-api}</version>
- </dependency>
-
- <!-- JBoss IIOP -->
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-iiop</artifactId>
- <version>${version.org.jboss.jbossas_jboss-as-iiop}</version>
+ <version>${version.org.jboss.jbossas_jboss-as}</version>
</dependency>
- <!-- JBoss JNP Server -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${version.org.jboss_jnpserver}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- JBoss Logging -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss_jboss-logging-log4j}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
- <version>${version.jboss_jboss-common-logging-log4j}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss_jboss-logging-spi}</version>
- </dependency>
-
- <!-- JBoss Metadata -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>${version.org.jboss_jboss-metadata}</version>
- </dependency>
-
<!-- JBoss Microcontainer -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -511,27 +352,6 @@
<version>${version.org.jboss.microcontainer_jboss-deployers-core-spi}</version>
</dependency>
- <!-- JBoss Security SPI -->
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi-bare</artifactId>
- <version>${version.org.jboss.security_jboss-security-spi-bare}</version>
- </dependency>
-
- <!-- JBoss SX Client -->
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-client</artifactId>
- <version>${version.org.jboss.security_jbosssx-client}</version>
- </dependency>
-
- <!-- JBoss Serialization -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <version>${version.jboss_jboss-serialization}</version>
- </dependency>
-
<!-- JBoss Test -->
<dependency>
<groupId>org.jboss</groupId>
@@ -539,13 +359,6 @@
<version>${version.org.jboss_jboss-test}</version>
</dependency>
- <!-- JBoss Transaction SPI -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <version>${version.org.jboss_jboss-transaction-spi}</version>
- </dependency>
-
<!-- JUnit -->
<dependency>
<groupId>junit</groupId>
@@ -554,20 +367,6 @@
<scope>test</scope>
</dependency>
- <!-- GNU Trove -->
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>${version.trove_trove}</version>
- </dependency>
-
- <!-- Quartz -->
- <dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- <version>${version.quartz_quartz}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-03-24 23:05:31 UTC (rev 71215)
+++ projects/ejb3/trunk/core/pom.xml 2008-03-25 00:37:42 UTC (rev 71216)
@@ -251,16 +251,6 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version> <!-- Only used here, for Unit Tests -->
@@ -275,15 +265,11 @@
<artifactId>ejb3-persistence</artifactId>
</dependency>
<dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- </dependency>
- <dependency>
- <groupId>hibernate-annotations</groupId>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency>
<dependency>
- <groupId>hibernate-entitymanager</groupId>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
@@ -375,7 +361,7 @@
<artifactId>jboss-as-cluster</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-connector</artifactId>
Modified: projects/ejb3/trunk/injection/pom.xml
===================================================================
--- projects/ejb3/trunk/injection/pom.xml 2008-03-24 23:05:31 UTC (rev 71215)
+++ projects/ejb3/trunk/injection/pom.xml 2008-03-25 00:37:42 UTC (rev 71216)
@@ -87,6 +87,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Logging SPI -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
</dependencies>
Modified: projects/ejb3/trunk/interceptors/pom.xml
===================================================================
--- projects/ejb3/trunk/interceptors/pom.xml 2008-03-24 23:05:31 UTC (rev 71215)
+++ projects/ejb3/trunk/interceptors/pom.xml 2008-03-25 00:37:42 UTC (rev 71216)
@@ -39,20 +39,15 @@
</build>
<dependencies>
- <!-- internal -->
+ <!-- Internal -->
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metadata</artifactId>
</dependency>
- <!-- external -->
+ <!-- External -->
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
@@ -60,15 +55,8 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!--
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.jboss</groupId>
<artifactId>jboss-metadata</artifactId>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/metadata/pom.xml
===================================================================
--- projects/ejb3/trunk/metadata/pom.xml 2008-03-24 23:05:31 UTC (rev 71215)
+++ projects/ejb3/trunk/metadata/pom.xml 2008-03-25 00:37:42 UTC (rev 71216)
@@ -33,14 +33,8 @@
<scope>test</scope>
</dependency>
- <!-- external -->
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list