[jboss-cvs] JBossAS SVN: r69135 - in trunk: cluster and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 18 18:35:00 EST 2008
Author: pgier
Date: 2008-01-18 18:35:00 -0500 (Fri, 18 Jan 2008)
New Revision: 69135
Modified:
trunk/cluster/pom.xml
trunk/ejb3/pom.xml
trunk/hibernate-int/pom.xml
trunk/management/pom.xml
trunk/pom.xml
trunk/tomcat/pom.xml
Log:
Updating jboss cache version, and re-organizing ejb3 dependencies.
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2008-01-18 23:16:44 UTC (rev 69134)
+++ trunk/cluster/pom.xml 2008-01-18 23:35:00 UTC (rev 69135)
@@ -5,7 +5,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
@@ -45,18 +44,18 @@
<artifactId>jgroups</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
+ <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.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.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2008-01-18 23:16:44 UTC (rev 69134)
+++ trunk/ejb3/pom.xml 2008-01-18 23:35:00 UTC (rev 69135)
@@ -5,7 +5,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
@@ -25,179 +24,331 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi-bare</artifactId>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.7.1</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-ejb3-cache</artifactId>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ <version>3.2.3.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-impl</artifactId>
+ <groupId>jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>2.3.0jboss.patch4-brew</version>
</dependency>
<dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ <version>1.0.01</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ <version>2.0.4.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>2.2.1.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-client</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>1.0.3.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</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>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>3.3.2.Beta1</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.2.Beta1</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossws-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.6-beta</version>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-classloading-spi</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.1.GA</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <artifactId>jboss-corba-ots-spi</artifactId>
+ <version>5.0.0.Beta4</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb3-cache</artifactId>
+ <version>0.11.1</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.0.0.Beta6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>1.0.0.GA</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>2.1.0.CR3</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-client</artifactId>
+ <version>1.0.0.BETA1</version>
</dependency>
<dependency>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-server-api</artifactId>
+ <version>1.0.0.BETA2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>0.1.2.Beta1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-impl</artifactId>
+ <version>0.1.2.Beta1</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-persistence-api</artifactId>
+ <artifactId>jboss-jca-api</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-servlet-api</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-mbeans</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-naming</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>javax.security</groupId>
- <artifactId>jaas</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-client</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-container</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>authorization-spi</artifactId>
+ <version>2.0.2.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi-bare</artifactId>
+ <version>2.0.2.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.2.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss</version>
+ </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>2.1.1</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2008-01-18 23:16:44 UTC (rev 69134)
+++ trunk/hibernate-int/pom.xml 2008-01-18 23:35:00 UTC (rev 69135)
@@ -32,8 +32,8 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml 2008-01-18 23:16:44 UTC (rev 69134)
+++ trunk/management/pom.xml 2008-01-18 23:35:00 UTC (rev 69135)
@@ -5,7 +5,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-01-18 23:16:44 UTC (rev 69134)
+++ trunk/pom.xml 2008-01-18 23:35:00 UTC (rev 69135)
@@ -66,11 +66,21 @@
</properties>
<build>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<id>test-jar</id>
@@ -242,9 +252,9 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>2.0.0.GA</version>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-pojo</artifactId>
+ <version>2.1.0.CR3</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -340,9 +350,9 @@
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>pojocache</artifactId>
- <version>2.0.0.GA</version>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>2.1.0.CR3</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -757,6 +767,11 @@
<version>${version.org.jboss.microcontainer}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>authorization-spi</artifactId>
+ <version>${version.org.jboss.security}</version>
+ </dependency>
+ <dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>${version.oswego-concurrent.concurrent}</version>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2008-01-18 23:16:44 UTC (rev 69134)
+++ trunk/tomcat/pom.xml 2008-01-18 23:35:00 UTC (rev 69135)
@@ -48,8 +48,8 @@
<artifactId>jta</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -80,8 +80,8 @@
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>pojocache</artifactId>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-pojo</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
More information about the jboss-cvs-commits
mailing list