[jboss-cvs] JBossAS SVN: r102999 - in trunk: webservices and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 25 21:54:43 EDT 2010
Author: ALRubinger
Date: 2010-03-25 21:54:43 -0400 (Thu, 25 Mar 2010)
New Revision: 102999
Modified:
trunk/component-matrix/pom.xml
trunk/webservices/pom.xml
Log:
[JBAS-7863] Import the EJB3 AS6 BOM, remove EJB3 depMgt from component-matrix
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-26 01:51:31 UTC (rev 102998)
+++ trunk/component-matrix/pom.xml 2010-03-26 01:54:43 UTC (rev 102999)
@@ -74,21 +74,7 @@
<version.org.jboss.cluster.server.api>1.1.1.GA</version.org.jboss.cluster.server.api>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
- <version.org.jboss.ejb3>1.0.6-alpha-1</version.org.jboss.ejb3>
- <version.org.jboss.ejb3.common.client>1.0.2</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.context>0.1.1</version.org.jboss.ejb3.context>
- <version.org.jboss.ejb3.core.client>1.3.0-alpha-1</version.org.jboss.ejb3.core.client>
- <version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
- <version.org.jboss.ejb3.ext.api>1.1.1</version.org.jboss.ejb3.ext.api>
- <version.org.jboss.ejb3.jpa.int>2.0.0-alpha-1</version.org.jboss.ejb3.jpa.int>
- <version.org.jboss.ejb3.mc.int>1.0.2</version.org.jboss.ejb3.mc.int>
- <version.org.jboss.ejb3.metrics.deployer>1.0.2</version.org.jboss.ejb3.metrics.deployer>
- <version.org.jboss.ejb3.proxy.clustered.client>1.0.3</version.org.jboss.ejb3.proxy.clustered.client>
- <version.org.jboss.ejb3.proxy.impl.client>1.0.7</version.org.jboss.ejb3.proxy.impl.client>
- <version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
- <version.org.jboss.ejb3.security.client>1.0.2</version.org.jboss.ejb3.security.client>
- <version.org.jboss.ejb3.timeout>0.1.1</version.org.jboss.ejb3.timeout>
- <version.org.jboss.ejb3.vfs>1.0.0-alpha-1</version.org.jboss.ejb3.vfs>
+ <version.org.jboss.ejb3.bom>0.1.0</version.org.jboss.ejb3.bom>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta5</version.org.jboss.jbossxb>
@@ -1563,7 +1549,8 @@
</dependency>
<!-- Combined integration jar. Maybe this can be removed when we just use the
- - individual compoennts -->
+ - individual compoennts
+-->
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-integration</artifactId>
@@ -2021,291 +2008,14 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-common</artifactId>
- <version>${version.org.jboss.ejb3.common.client}</version>
- <classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.ejb3.bom</groupId>
+ <artifactId>bom-as6</artifactId>
+ <version>${version.org.jboss.ejb3.bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-common</artifactId>
- <version>${version.org.jboss.ejb3.common.client}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3.context</groupId>
- <artifactId>jboss-ejb3-context-base</artifactId>
- <version>${version.org.jboss.ejb3.context}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3.context</groupId>
- <artifactId>jboss-ejb3-context-naming</artifactId>
- <version>${version.org.jboss.ejb3.context}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3_1</artifactId>
- <version>${version.org.jboss.ejb3}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-metadata</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- <version>${version.org.jboss.ejb3.core.client}</version>
- <classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-metadata</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3.timeout</groupId>
- <artifactId>jboss-ejb3-timeout-3.1</artifactId>
- <version>${version.org.jboss.ejb3.timeout}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>jboss-ejb3-vfs-spi</artifactId>
- <version>${version.org.jboss.ejb3.vfs}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>jboss-ejb3-vfs-impl-vfs3</artifactId>
- <version>${version.org.jboss.ejb3.vfs}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
- <version>${version.org.jboss.ejb3.endpoint.deployer}</version>
- <exclusions>
- <!-- EJB3 artifacts come in via jboss-ejb3-as-int -->
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-jpa-int</artifactId>
- <version>${version.org.jboss.ejb3.jpa.int}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-mc-int</artifactId>
- <version>${version.org.jboss.ejb3.mc.int}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-metrics-deployer</artifactId>
- <version>${version.org.jboss.ejb3.metrics.deployer}</version>
- <exclusions>
- <!-- EJB3 artifacts come in via jboss-ejb3_1 -->
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- </exclusion>
- </exclusions>
-
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-impl</artifactId>
- <version>${version.org.jboss.ejb3.proxy.impl.client}</version>
- <classifier>client</classifier>
- <exclusions>
- <!-- Needs to come transitively from ejb3-core dependency -->
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-interceptors</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-spi</artifactId>
- <version>${version.org.jboss.ejb3.proxy.spi.client}</version>
- <classifier>client</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-clustered</artifactId>
- <version>${version.org.jboss.ejb3.proxy.clustered.client}</version>
- <classifier>client</classifier>
- <exclusions>
- <!-- Needs to come transitively from ejb3-core dependency -->
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-security</artifactId>
- <version>${version.org.jboss.ejb3.security.client}</version>
- <classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-aspects</artifactId>
- </exclusion>
- <!-- Needs to come transitively from ejb3-core dependency -->
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-interceptors</artifactId>
- </exclusion>
-
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api</artifactId>
<version>${version.org.jboss.bootstrap}</version>
@@ -2378,12 +2088,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>${version.org.jboss.ejb3.ext.api}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-deployers</artifactId>
<version>${version.org.jboss.jpa.deployers}</version>
@@ -3002,7 +2706,8 @@
<exclude>sun-jaxb:jaxb-xjc</exclude>
<exclude>sun-jaxws:streambuffer</exclude>
<!-- JBAS-7531 org.jboss.ejb3:jboss-ejb3-as-int is retired.
- Use org.jboss.ejb3:jboss-ejb3_1 instead -->
+ Use org.jboss.ejb3:jboss-ejb3_1 instead
+-->
<exclude>org.jboss.ejb3:jboss-ejb3-as-int</exclude>
<exclude>org.jboss.microcontainer:jboss-aop-mc-int</exclude>
<exclude>org.jboss.microcontainer:jboss-dependency</exclude>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-03-26 01:51:31 UTC (rev 102998)
+++ trunk/webservices/pom.xml 2010-03-26 01:54:43 UTC (rev 102999)
@@ -196,7 +196,6 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
- <version>${version.org.jboss.ejb3.common.client}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
More information about the jboss-cvs-commits
mailing list