[jboss-cvs] JBossAS SVN: r94164 - in branches/Branch_5_x: server/src/etc/conf/all/bootstrap and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2009-09-30 10:50:54 -0400 (Wed, 30 Sep 2009)
New Revision: 94164

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
[JBAS-7302] Upgrade to aop 2.1.6.GA

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-09-30 14:25:21 UTC (rev 94163)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-09-30 14:50:54 UTC (rev 94164)
@@ -52,7 +52,7 @@
     <version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>4.0.0.CR1</version.org.hibernate.validator>
     <version.org.hibernate>3.3.1.GA</version.org.hibernate>
-    <version.org.jboss.aop>2.1.3.GA</version.org.jboss.aop>
+    <version.org.jboss.aop>2.1.6.GA</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
     <version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>
@@ -665,40 +665,10 @@
         <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop-asintegration-core</artifactId>
         <version>${version.org.jboss.aop}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.jbossas</groupId>
-            <artifactId>jboss-as-system-jmx</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-test</artifactId>
-          </exclusion>
-        </exclusions>        
       </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop-asintegration-jmx</artifactId>
-        <version>${version.org.jboss.aop}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.jbossas</groupId>
-            <artifactId>jboss-as-system-jmx</artifactId>
-          </exclusion>        
-          <exclusion>
-            <groupId>org.jboss.jbossas</groupId>
-            <artifactId>jboss-as-j2se</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.jbossas</groupId>
-            <artifactId>jboss-as-jmx</artifactId>
-          </exclusion>          
-        </exclusions>        
-      </dependency>
-      
-      <dependency>
-        <groupId>org.jboss.aop</groupId>
         <artifactId>jboss-aop-asintegration-mc</artifactId>
         <version>${version.org.jboss.aop}</version>
         <exclusions>

Modified: branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml	2009-09-30 14:25:21 UTC (rev 94163)
+++ branches/Branch_5_x/server/src/etc/conf/all/bootstrap/aop.xml	2009-09-30 14:50:54 UTC (rev 94164)
@@ -9,7 +9,6 @@
 
    <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
       <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
-      <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
       <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
       <root>${jboss.lib.url}jboss-aop-deployers.jar</root>
       <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-09-30 14:25:21 UTC (rev 94163)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-09-30 14:50:54 UTC (rev 94164)
@@ -452,14 +452,6 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jboss-aop-asintegration-jmx</artifactId>
-              <version>${version.org.jboss.aop}</version>
-              <mapping>
-                <componentId>jboss.aop</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>org.jboss.aop</groupId>
               <artifactId>jboss-aop-asintegration-mc</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
@@ -1207,10 +1199,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop-asintegration-jmx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop-asintegration-mc</artifactId>
     </dependency>
     <dependency>