[jboss-cvs] JBossAS SVN: r76062 - in projects/microcontainer/trunk: build and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2008-07-21 11:15:10 -0400 (Mon, 21 Jul 2008)
New Revision: 76062

Modified:
   projects/microcontainer/trunk/aop-mc-int/.classpath
   projects/microcontainer/trunk/aop-mc-int/pom.xml
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/guice-int/.classpath
Log:
[JBMICROCONT-308] Upgrade aop and javassist

Modified: projects/microcontainer/trunk/aop-mc-int/.classpath
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/.classpath	2008-07-21 14:45:04 UTC (rev 76061)
+++ projects/microcontainer/trunk/aop-mc-int/.classpath	2008-07-21 15:15:10 UTC (rev 76062)
@@ -11,7 +11,7 @@
   <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.8.0.GA/javassist-3.8.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.8.0.GA/javassist-3.8.0.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR14/jboss-aop-2.0.0.CR14.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR14/jboss-aop-2.0.0.CR14-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0-SNAPSHOT/jboss-aop-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.0.0-SNAPSHOT/jboss-aop-2.0.0-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>

Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml	2008-07-21 14:45:04 UTC (rev 76061)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml	2008-07-21 15:15:10 UTC (rev 76062)
@@ -135,6 +135,7 @@
               <includes>
                 <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
                 <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
+                <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
               </includes>
               <systemProperties>
                 <property>
@@ -159,6 +160,7 @@
               <includes>
                 <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
                 <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
+                <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
               </includes>
               <systemProperties>
                 <property>

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2008-07-21 14:45:04 UTC (rev 76061)
+++ projects/microcontainer/trunk/build/pom.xml	2008-07-21 15:15:10 UTC (rev 76062)
@@ -38,8 +38,8 @@
     <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
     <version.jbossxb>2.0.0.CR9</version.jbossxb>
     <version.jboss.vfs>2.0.0.Beta19</version.jboss.vfs>
-    <version.javassist>3.8.0.GA</version.javassist>
-    <version.jboss.aop>2.0.0.CR14</version.jboss.aop>
+    <version.javassist>3.8.1.GA</version.javassist>
+    <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
     <version.org.jboss.reflect>2.0.0.Beta12</version.org.jboss.reflect>
     <version.org.jboss.mdr>2.0.0-SNAPSHOT</version.org.jboss.mdr>
     <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>

Modified: projects/microcontainer/trunk/guice-int/.classpath
===================================================================
--- projects/microcontainer/trunk/guice-int/.classpath	2008-07-21 14:45:04 UTC (rev 76061)
+++ projects/microcontainer/trunk/guice-int/.classpath	2008-07-21 15:15:10 UTC (rev 76062)
@@ -5,7 +5,7 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0.jar" sourcepath="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>