[jboss-cvs] JBossAS SVN: r79099 - trunk/thirdparty.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-10-03 11:28:56 -0400 (Fri, 03 Oct 2008)
New Revision: 79099

Modified:
   trunk/thirdparty/pom.xml
Log:
[JBAS-5894] Upgrade to AOP 2.0.0.CR18 while waiting for GA

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-10-03 15:28:39 UTC (rev 79098)
+++ trunk/thirdparty/pom.xml	2008-10-03 15:28:56 UTC (rev 79099)
@@ -374,15 +374,15 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-aop-as4-deployer</artifactId>
+              <artifactId>jboss-aop-asintegration-core</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
                 <componentId>jboss.aop</componentId>
               </mapping>
-            </dependency>-->
+            </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-aop-deployer-jdk50</artifactId>
+              <artifactId>jboss-aop-asintegration-jmx</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
                 <componentId>jboss.aop</componentId>
@@ -390,7 +390,7 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-aop-jboss4-jdk50</artifactId>
+              <artifactId>jboss-aop-asintegration-mc</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
                 <componentId>jboss.aop</componentId>
@@ -398,7 +398,7 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-aop-jdk50-client</artifactId>
+              <artifactId>jboss-aop</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
                 <componentId>jboss.aop</componentId>
@@ -406,15 +406,16 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-aop-jdk50</artifactId>
+              <artifactId>jboss-aop</artifactId>
               <version>${version.org.jboss.aop}</version>
+              <classifier>client</classifier>
               <mapping>
                 <componentId>jboss.aop</componentId>
               </mapping>
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
+              <artifactId>jboss-aop-aspects</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
                 <componentId>jboss.aop</componentId>
@@ -437,14 +438,6 @@
               </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>
@@ -1092,22 +1085,18 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop-as4-deployer</artifactId>
+      <artifactId>jboss-aop-asintegration-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop-deployer-jdk50</artifactId>
+      <artifactId>jboss-aop-asintegration-jmx</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop-jboss4-jdk50</artifactId>
+      <artifactId>jboss-aop-asintegration-mc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop-jdk50-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.aop</groupId>
       <artifactId>jrockit-pluggable-instrumentor</artifactId>
     </dependency>
     <dependency>
@@ -1116,15 +1105,16 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop-jdk50</artifactId>
+      <artifactId>jboss-aop</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
+      <artifactId>jboss-aop</artifactId>
+      <classifier>client</classifier>
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>resources</artifactId>
+      <artifactId>jboss-aop-aspects</artifactId>
     </dependency>
     <dependency>
       <groupId>jboss.common</groupId>