[jboss-cvs] JBossAS SVN: r73088 - in trunk: component-matrix and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 6 16:09:09 EDT 2008
Author: pgier
Date: 2008-05-06 16:09:09 -0400 (Tue, 06 May 2008)
New Revision: 73088
Modified:
trunk/aspects/pom.xml
trunk/component-matrix/pom.xml
trunk/console/pom.xml
trunk/jbossas/remoting/pom.xml
trunk/profileservice/pom.xml
trunk/spring-int/pom.xml
trunk/system/pom.xml
trunk/thirdparty/pom.xml
trunk/tomcat/pom.xml
trunk/webservices/pom.xml
Log:
Update AOP to 2.0.0.CR9. Changed groupId and add some exclusions for older aop artifacts.
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/aspects/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -79,19 +79,19 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-deployer-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jboss4-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/component-matrix/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -36,7 +36,7 @@
<version.jboss.jbossws-framework>3.0.1.GA</version.jboss.jbossws-framework>
<version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
<version.jboss.web>2.1.1.CR2</version.jboss.web>
- <version.org.jboss.aop>2.0.0.CR8</version.org.jboss.aop>
+ <version.org.jboss.aop>2.0.0.CR9</version.org.jboss.aop>
<version.org.jboss.mdr>2.0.0.Beta15</version.org.jboss.mdr>
<version.org.jboss.vfs>2.0.0.Beta11</version.org.jboss.vfs>
<version.org.jboss.cl>2.0.0.Beta12</version.org.jboss.cl>
@@ -459,18 +459,36 @@
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-remoting-aspects</artifactId>
<version>1.0.0.Beta1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-transaction-aspects</artifactId>
<version>1.0.0.Beta1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-security-aspects</artifactId>
<version>1.0.0.Beta1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -510,55 +528,55 @@
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-as4-deployer</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-deployer-jdk50</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jboss4-jdk50</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50-client</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jrockit-pluggable-instrumentor</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>pluggable-instrumentor</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>resources</artifactId>
<version>${version.org.jboss.aop}</version>
</dependency>
@@ -1070,6 +1088,10 @@
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1216,6 +1238,14 @@
<groupId>org.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>
</exclusions>
</dependency>
@@ -1253,6 +1283,14 @@
<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>
</exclusions>
</dependency>
@@ -1260,7 +1298,17 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
<version>0.13.0-SNAPSHOT</version>
- <classifier>client</classifier>
+ <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>
+ </exclusions>
</dependency>
<dependency>
@@ -1333,6 +1381,16 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
<version>${version.org.jboss.microcontainer}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-aspects</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/console/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -102,7 +102,7 @@
<artifactId>bsh</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/jbossas/remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/jbossas/remoting/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -23,7 +23,7 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/profileservice/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -71,7 +71,7 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/spring-int/pom.xml
===================================================================
--- trunk/spring-int/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/spring-int/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -28,7 +28,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/system/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -46,7 +46,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/thirdparty/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -350,6 +350,78 @@
</mapping>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-as4-deployer</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-deployer-jdk50</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jboss4-jdk50</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50-client</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jrockit-pluggable-instrumentor</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>resources</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <mapping>
+ <componentId>jboss.aop</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
<mapping>
@@ -417,7 +489,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
- <classifier>client</classifier>
+ <classifier>client</classifier>
<mapping>
<componentId>jboss.jboss-ejb3-security</componentId>
<artifactId>jboss-ejb3-security-client</artifactId>
@@ -949,31 +1021,39 @@
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-as4-deployer</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-deployer-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jboss4-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50-client</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jrockit-pluggable-instrumentor</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>pluggable-instrumentor</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
<artifactId>resources</artifactId>
</dependency>
<dependency>
@@ -1118,42 +1198,7 @@
<groupId>objectweb-joramtests</groupId>
<artifactId>joramtests</artifactId>
</dependency>
-
- <!-- jboss deps -->
<dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-as4-deployer</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jboss4-jdk50</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50-client</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jrockit-pluggable-instrumentor</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-transaction-aspects</artifactId>
</dependency>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/tomcat/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -154,7 +154,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
<exclusions>
<exclusion>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2008-05-06 18:12:48 UTC (rev 73087)
+++ trunk/webservices/pom.xml 2008-05-06 20:09:09 UTC (rev 73088)
@@ -61,7 +61,7 @@
<artifactId>jta</artifactId>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list