[jboss-cvs] JBossAS SVN: r71221 - in trunk: console and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 24 23:24:19 EDT 2008
Author: pgier
Date: 2008-03-24 23:24:19 -0400 (Mon, 24 Mar 2008)
New Revision: 71221
Modified:
trunk/aspects/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:
Making the aop dependencies match the component-matrix names.
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/aspects/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -71,19 +71,19 @@
<artifactId>jboss-common-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
+ <groupId>jboss.aop</groupId>
<artifactId>jboss-aop-deployer-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
+ <groupId>jboss.aop</groupId>
<artifactId>jboss-aop-jboss4-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
+ <groupId>jboss.aop</groupId>
<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
</dependency>
<dependency>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/console/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -102,8 +102,8 @@
<artifactId>bsh</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/jbossas/remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/jbossas/remoting/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -23,8 +23,8 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/profileservice/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -71,8 +71,8 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
Modified: trunk/spring-int/pom.xml
===================================================================
--- trunk/spring-int/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/spring-int/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -28,8 +28,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
<groupId>apache-xerces</groupId>
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/system/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -46,8 +46,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/thirdparty/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -248,36 +248,8 @@
<mapping>
<componentId>xmlunit-xmlunit</componentId>
</mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <mapping>
- <componentId>jboss.aop</componentId>
- </mapping>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- <mapping>
- <componentId>jboss.aop</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-jboss4-jdk50</artifactId>
- <mapping>
- <componentId>jboss.aop</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
- <mapping>
- <componentId>jboss.aop</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<mapping>
@@ -536,61 +508,12 @@
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
+ <artifactId>*</artifactId>
<mapping>
<componentId>jboss.jboss-deployers</componentId>
</mapping>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <mapping>
- <componentId>jboss.jboss-deployers</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
<mapping>
@@ -1009,22 +932,38 @@
<!-- jboss deps -->
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-as4-deployer</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
+ <groupId>jboss.aop</groupId>
<artifactId>jboss-aop-deployer-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
+ <groupId>jboss.aop</groupId>
<artifactId>jboss-aop-jboss4-jdk50</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
+ <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.cache</groupId>
<artifactId>jbosscache-core</artifactId>
</dependency>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/tomcat/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -154,8 +154,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2008-03-25 03:20:56 UTC (rev 71220)
+++ trunk/webservices/pom.xml 2008-03-25 03:24:19 UTC (rev 71221)
@@ -61,8 +61,8 @@
<artifactId>jta</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
More information about the jboss-cvs-commits
mailing list