[jbosscache-commits] JBoss Cache SVN: r4584 - pojo/trunk.

[jbosscache-commits at lists.jboss.org]

Author: jason.greene at jboss.com
Date: 2007-10-09 23:22:20 -0400 (Tue, 09 Oct 2007)
New Revision: 4584

Modified:
   pojo/trunk/pom.xml
Log:
Use AOP Beta 3


Modified: pojo/trunk/pom.xml
===================================================================
--- pojo/trunk/pom.xml	2007-10-09 21:54:00 UTC (rev 4583)
+++ pojo/trunk/pom.xml	2007-10-10 03:22:20 UTC (rev 4584)
@@ -5,6 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <properties>
     <jbosscache-pojo-version>2.1.0-SNAPSHOT</jbosscache-pojo-version>
+    <jboss.aop.version>2.0.0.beta1</jboss.aop.version>
   </properties>
   <parent>
     <groupId>org.jboss.cache</groupId>
@@ -21,7 +22,7 @@
     <dependency>
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>${jboss.aop.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.cache</groupId>
@@ -38,7 +39,7 @@
   </dependencies>
   <build>
     <plugins>
-      <plugin>
+    <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-1</version>
         <executions>
@@ -82,7 +83,7 @@
           </systemProperties>
           <groups>functional</groups>
           <forkMode>always</forkMode>
-          <argLine>-Djboss.aop.path=${basedir}/src/main/resources/META-INF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/jboss-aop/2.0.0-SNAPSHOT/jboss-aop-2.0.0-SNAPSHOT.jar</argLine>
+          <argLine>-Djboss.aop.path=${basedir}/src/main/resources/META-INF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/jboss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine>
           <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) -->
           <!-- This seems to fail in some cases on 2.3 as well, disable for now -->
           <useSystemClassLoader>true</useSystemClassLoader>
@@ -92,7 +93,15 @@
       <plugin>
         <groupId>org.jboss.maven.plugins</groupId>
         <artifactId>maven-jbossaop-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0.0.beta1</version>
+        <!-- HACK: AOP project has broken deps -->
+        <dependencies>    
+          <dependency>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-container</artifactId>
+            <version>2.0.0.Beta4</version>
+          </dependency>
+        </dependencies>    
         <executions>
           <execution>
             <id>aopc</id>
@@ -102,7 +111,9 @@
             </goals>
             <configuration>
               <verbose>false</verbose>
+              <aoppaths>
               <aoppath>${basedir}/src/main/resources/META-INF/pojocache-aop.xml</aoppath>
+              </aoppaths>
             </configuration>
           </execution>
         </executions>
@@ -255,6 +266,5 @@
       <id>repository.jboss.org</id>
       <url>http://repository.jboss.org/maven2</url>
     </repository>
-
   </repositories>
 </project>