[jboss-cvs] JBossAS SVN: r102652 - in projects/aop/branches/Branch_2_2: aop and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 19 20:02:56 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-19 20:02:54 -0400 (Fri, 19 Mar 2010)
New Revision: 102652
Modified:
projects/aop/branches/Branch_2_2/aop/.classpath
projects/aop/branches/Branch_2_2/aop/pom.xml
projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java
projects/aop/branches/Branch_2_2/aophelper/.classpath
projects/aop/branches/Branch_2_2/aophelper/pom.xml
projects/aop/branches/Branch_2_2/asintegration-core/.classpath
projects/aop/branches/Branch_2_2/asintegration-core/pom.xml
projects/aop/branches/Branch_2_2/asintegration-jmx/.classpath
projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml
projects/aop/branches/Branch_2_2/asintegration-mc/.classpath
projects/aop/branches/Branch_2_2/asintegration-mc/pom.xml
projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java
projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
projects/aop/branches/Branch_2_2/aspects/.classpath
projects/aop/branches/Branch_2_2/aspects/pom.xml
projects/aop/branches/Branch_2_2/build/.classpath
projects/aop/branches/Branch_2_2/build/pom.xml
projects/aop/branches/Branch_2_2/deployers/.classpath
projects/aop/branches/Branch_2_2/deployers/pom.xml
projects/aop/branches/Branch_2_2/jrockit-pluggable-instrumentor/pom.xml
projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml
projects/aop/branches/Branch_2_2/pluggable-instrumentor/.classpath
projects/aop/branches/Branch_2_2/pluggable-instrumentor/pom.xml
projects/aop/branches/Branch_2_2/pom.xml
Log:
[JBAOP-775] Ported changes to branch 2_2.
Modified: projects/aop/branches/Branch_2_2/aop/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/aop/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aop/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="org/jboss/aop/hook/JRockitClassPreProcessor.java" including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" including="jboss-aop_1_0.dtd|jboss-aop_2_0.xsd" kind="src" path="docs"/>
- <classpathentry excluding="**/*.java" including="jbossorg-eula.txt" kind="src" path="src/etc"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry excluding="org/jboss/aop/hook/JRockit*" kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="docs"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/etc"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/aop/branches/Branch_2_2/aop/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/aop/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aop/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.aop</groupId>
@@ -12,7 +12,7 @@
<description>JBoss AOP Framework</description>
<url>http://www.jboss.org/jbossaop</url>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<resources>
<resource>
<directory>docs</directory>
@@ -32,7 +32,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<skip>true</skip>
<forkMode>always</forkMode>
@@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<executions>
<execution>
<id>create-test-jar</id>
@@ -92,7 +92,7 @@
<descriptors>
<descriptor>src/assembly/client.xml</descriptor>
</descriptors>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -116,7 +116,7 @@
<descriptors>
<descriptor>src/assembly/client-sources.xml</descriptor>
</descriptors>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -138,7 +138,7 @@
<descriptors>
<descriptor>src/assembly/single.xml</descriptor>
</descriptors>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -157,7 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<executions>
<execution>
<id>copy-output-jars</id>
Modified: projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java
===================================================================
--- projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java 2010-03-20 00:02:54 UTC (rev 102652)
@@ -129,7 +129,7 @@
* @return the info
*/
@Override
- public Object get(Class clazz)
+ public TypeInfo get(Class clazz)
{
throw new RuntimeException("This method is void!!!");
}
Modified: projects/aop/branches/Branch_2_2/aophelper/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/aophelper/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aophelper/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/aophelper/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/aophelper/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aophelper/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.aop</groupId>
<artifactId>aophelper</artifactId>
<packaging>jar</packaging>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>JBoss AOP Helper</name>
<pluginRepositories>
Modified: projects/aop/branches/Branch_2_2/asintegration-core/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-core/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-core/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-core/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-core/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-asintegration-core</artifactId>
@@ -11,7 +11,7 @@
<description>JBoss AOP AS Integrationi Core</description>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<executions>
<execution>
<id>surefire-report</id>
@@ -91,10 +91,6 @@
<dependencies>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
@@ -106,15 +102,7 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- </dependency-->
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
Modified: projects/aop/branches/Branch_2_2/asintegration-jmx/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-jmx/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-jmx/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-asintegration-jmx</artifactId>
@@ -11,7 +11,7 @@
<description>JBoss AOP AS Integration JMX</description>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -24,7 +24,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<executions>
<execution>
<id>test-jar</id>
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<executions>
<execution>
<id>surefire-report</id>
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<executions>
<execution>
<id>create-test-jars</id>
@@ -75,8 +75,7 @@
<phase>process-test-classes</phase>
<configuration>
<tasks>
- <property name="test.jar.suffix" value="-test-classpool-" />
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
+ <property name="test.jar.suffix" value="-test-classpool-" /> <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
<jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/a/*.class" />
<jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/b/*.class" />
<jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar" basedir="${project.build.testOutputDirectory}" includes="org/jboss/test/aop/classpool/ucl/support/excluded/b/*.class" />
@@ -117,12 +116,12 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: projects/aop/branches/Branch_2_2/asintegration-mc/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-mc/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-mc/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/asintegration-mc/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-mc/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-mc/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-asintegration-mc</artifactId>
@@ -11,7 +11,7 @@
<description>JBoss AOP AS Integration MC</description>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -24,7 +24,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<executions>
<execution>
<id>test-jar</id>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
@@ -54,18 +54,15 @@
<excludes>
<exclude>org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.class</exclude>
</excludes>
- <systemProperties>
- <property>
- <name>build.testlog</name>
- <value>target/surefire-reports/tests.log</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <build.testlog>target/surefire-reports/tests.log</build.testlog>
+ </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<executions>
<execution>
<id>surefire-report</id>
@@ -79,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<executions>
<execution>
<id>create-test-jars</id>
@@ -113,7 +110,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
@@ -155,7 +152,7 @@
<artifactId>jboss-mdr</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
Modified: projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java 2010-03-20 00:02:54 UTC (rev 102652)
@@ -127,18 +127,10 @@
aopFilter = new PatternClassFilter(classPatterns, resourcePatterns, null);
}
- protected static VFSClassLoaderDomainRegistry domainRegistry;
+ protected static VFSClassLoaderDomainRegistry domainRegistry = new VFSClassLoaderDomainRegistry();
ClassLoading classLoading = new ClassLoading();
- static
- {
- domainRegistry = new VFSClassLoaderDomainRegistry();
-
- AspectManager.setClassPoolFactory(new JBossClDelegatingClassPoolFactory(domainRegistry, new RegisterModuleCallback()));
- }
-
-
public static ClassLoaderSystem getSystem()
{
if (!initialisedDefaultDomain)
Modified: projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,26 +1,29 @@
/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.aop.classpool.jbosscl.test;
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.asintegration.jboss5.RegisterModuleCallback;
+import org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory;
import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
/**
@@ -30,6 +33,10 @@
*/
public class JBossClClassPoolTestDelegate extends MicrocontainerTestDelegate
{
+ static
+ {
+ AspectManager.setClassPoolFactory(new JBossClDelegatingClassPoolFactory(JBossClClassPoolTest.domainRegistry, new RegisterModuleCallback()));
+ }
public JBossClClassPoolTestDelegate(Class<?> clazz) throws Exception
{
Modified: projects/aop/branches/Branch_2_2/aspects/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/aspects/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aspects/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/test/asynch/" including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/aop/branches/Branch_2_2/aspects/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/aspects/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/aspects/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<artifactId>jboss-aop-parent</artifactId>
<groupId>org.jboss.aop</groupId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-aspects</artifactId>
@@ -10,12 +10,12 @@
<description>JBoss AOP Aspects</description>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -29,7 +29,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
@@ -77,8 +77,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>test</scope>
</dependency>
<!--<dependency>
Modified: projects/aop/branches/Branch_2_2/build/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/build/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/build/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/build/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/build/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/build/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-dist</artifactId>
Modified: projects/aop/branches/Branch_2_2/deployers/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/deployers/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/deployers/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/deployers/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/deployers/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/deployers/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -2,7 +2,7 @@
<parent>
<artifactId>jboss-aop-parent</artifactId>
<groupId>org.jboss.aop</groupId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-aop-deployers</artifactId>
@@ -10,12 +10,12 @@
<description>JBoss AOP Deployers</description>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -24,7 +24,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
@@ -49,11 +49,11 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
</dependencies>
Modified: projects/aop/branches/Branch_2_2/jrockit-pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/jrockit-pluggable-instrumentor/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/jrockit-pluggable-instrumentor/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -3,19 +3,19 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.7-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>jrockit-pluggable-instrumentor</artifactId>
<packaging>jar</packaging>
<name>JBoss AOP JRockit Pluggable Instrumentor</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -36,7 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<excludes>
<!-- Everything is excluded because the source is compiled by ant.-->
@@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<archive>
<manifest>
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<executions>
<execution>
<id>jrockit-compile</id>
Modified: projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -12,8 +12,8 @@
<name>JBoss AOP Maven Plugin</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/aop/branches/Branch_2_1/maven-jbossaop-plugin/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/branches/Branch_2_1/maven-jbossaop-plugin/</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/</developerConnection>
</scm>
<distributionManagement>
Modified: projects/aop/branches/Branch_2_2/pluggable-instrumentor/.classpath
===================================================================
--- projects/aop/branches/Branch_2_2/pluggable-instrumentor/.classpath 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/pluggable-instrumentor/.classpath 2010-03-20 00:02:54 UTC (rev 102652)
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/aop/branches/Branch_2_2/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/pluggable-instrumentor/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/pluggable-instrumentor/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -4,14 +4,14 @@
<parent>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>pluggable-instrumentor</artifactId>
<packaging>jar</packaging>
<name>JBoss AOP Pluggable Instrumentor</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: projects/aop/branches/Branch_2_2/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/pom.xml 2010-03-19 23:55:52 UTC (rev 102651)
+++ projects/aop/branches/Branch_2_2/pom.xml 2010-03-20 00:02:54 UTC (rev 102652)
@@ -10,30 +10,31 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-parent</artifactId>
<packaging>pom</packaging>
- <version>2.1.9-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<description>JBoss AOP</description>
<name>JBoss AOP Parent POM</name>
<url>http://www.jboss.org/jbossaop/</url>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/branches/Branch_2_1/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/branches/Branch_2_1/</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/branches/Branch_2_2/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/branches/Branch_2_2/</developerConnection>
</scm>
<properties>
- <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
- <version.org.jboss.jbossas>5.1.0.GA</version.org.jboss.jbossas>
+ <version.javassist.javassist>3.11.0.GA</version.javassist.javassist>
+ <version.org.jboss.jbossas>6.0.0.20100216-M2</version.org.jboss.jbossas>
<version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
- <version.org.jboss.cl>2.2.0.Alpha3</version.org.jboss.cl>
- <version.org.jboss.deployers>2.2.0.Alpha2</version.org.jboss.deployers>
- <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
- <version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
- <version.org.jboss.jboss-vfs>3.0.0.CR1</version.org.jboss.jboss-vfs>
- <version.org.jboss.microcontainer.jboss-kernel>2.0.9.GA</version.org.jboss.microcontainer.jboss-kernel>
+ <version.org.jboss.cl>2.2.0.Alpha4</version.org.jboss.cl>
+ <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
+ <version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
+ <version.org.jboss.jboss-reflect>2.2.0.Alpha4</version.org.jboss.jboss-reflect>
+ <version.org.jboss.jboss-vfs>3.0.0.CR3</version.org.jboss.jboss-vfs>
+ <version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
- <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
- <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
+ <version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
+ <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
<version.xdoclet>1.2.3</version.xdoclet>
<version.jarjar>1.0</version.jarjar>
+ <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
</properties>
<build>
@@ -41,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -55,7 +56,7 @@
</requireMavenVersion>
<requireJavaVersion>
<version>1.5</version>
- </requireJavaVersion>
+ </requireJavaVersion>
</rules>
</configuration>
</execution>
@@ -64,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <version>2.0-beta-9</version>
<configuration>
<tagBase>https://svn.jboss.org/repos/jbossas/projects/aop/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -109,11 +110,10 @@
<version>1.0.0.CR5</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.8.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -123,12 +123,12 @@
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
@@ -141,8 +141,8 @@
<version>${version.org.jboss.jboss-reflect}</version>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -152,8 +152,8 @@
<version>${version.org.jboss.mdr}</version>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -209,7 +209,7 @@
<version>${version.org.jboss.cl}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-classloading-spi</artifactId>
</exclusion>
</exclusions>
@@ -248,7 +248,7 @@
<version>${version.org.jboss.deployers}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
@@ -299,39 +299,39 @@
<version>${version.org.jboss.integration}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.CR2</version>
+ <version>1.5.0.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>2.5.0.CR2</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Beta2</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>${version.org.jboss.mx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.test</groupId>
@@ -342,12 +342,17 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <!-- see JBAS-6503 -->
+ <version>6.0.0.M1</version>
<exclusions>
<exclusion>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-jdk50</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -382,11 +387,6 @@
<version>${version.org.jboss.man}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
<version>1.0.3.GA</version>
@@ -424,7 +424,7 @@
<dependency>
<groupId>snmptrapappender</groupId>
<artifactId>snmpTrapAppender</artifactId>
- <version>1.2.8</version>
+ <version>1.2.14</version>
</dependency>
<dependency>
<groupId>trove</groupId>
More information about the jboss-cvs-commits
mailing list