[jboss-cvs] JBossAS SVN: r102487 - in projects/aop/trunk: aop and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 16 17:17:23 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-16 17:17:22 -0400 (Tue, 16 Mar 2010)
New Revision: 102487
Modified:
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/aophelper/pom.xml
projects/aop/trunk/asintegration-core/pom.xml
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/deployers/pom.xml
projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml
projects/aop/trunk/pluggable-instrumentor/pom.xml
projects/aop/trunk/pom.xml
Log:
[JBAOP-775] Updated more maven plugin dependencies, removed deprecated stuff from pom.xml, excluded jboss-test dependency from jboss-as-system-jmx (responsible for security failures in asintegration-jmx module), and disabled console log output in asintegration-jmx module.
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/aop/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -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/trunk/aophelper/pom.xml
===================================================================
--- projects/aop/trunk/aophelper/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/aophelper/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -52,7 +52,7 @@
</repositories>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
Modified: projects/aop/trunk/asintegration-core/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-core/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/asintegration-core/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -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>
@@ -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-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<executions>
<execution>
<id>create-test-jars</id>
@@ -54,10 +54,10 @@
<configuration>
<tasks>
<property name="test.jar.suffix" value="-test-classpool-"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}a.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/support/a/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}b.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/support/b/*.class"/>
<delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/a"/>
@@ -70,7 +70,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>
@@ -79,7 +79,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>
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -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>
@@ -47,12 +47,9 @@
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <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>
@@ -72,7 +69,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>
@@ -83,22 +80,22 @@
<configuration>
<tasks>
<property name="test.jar.suffix" value="-test-classpool-"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar"
+ <jar destfile="${project.build.directory}/${project.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"
+ <jar destfile="${project.build.directory}/${project.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"
+ <jar destfile="${project.build.directory}/${project.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"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}b2.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}c1.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}c1.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/ucl/support/excluded/c/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}c2.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/ucl/support/excluded/c/*.class"/>
<delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/ucl/support/excluded"/>
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -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>
@@ -54,12 +54,9 @@
<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>
@@ -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>
@@ -90,31 +87,31 @@
<configuration>
<tasks>
<property name="test.jar.suffix" value="-test-classpool-"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}a1.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}a2.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/a/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}b1.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}b2.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/b/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}c1.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}c2.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/support/excluded/c/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}replacereferences-parent.jar">
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}replacereferences-parent.jar">
<fileset dir="${project.build.testOutputDirectory}">
<include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**"/>
<exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/*.class"/>
</fileset>
</jar>
- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}replacereferences-child.jar">
+ <jar destfile="${project.build.directory}/${project.artifactId}${test.jar.suffix}replacereferences-child.jar">
<fileset dir="${project.build.testOutputDirectory}">
<include name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/**"/>
<exclude name="org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/ParentCaller.class"/>
@@ -122,13 +119,13 @@
</jar>
<delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/excluded"/>
- <jar destfile="${project.build.directory}/${artifactId}-test-weaving-target.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}-test-weaving-target.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/target/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}-test-weaving-aspects.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}-test-weaving-aspects.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/aspects/*.class"/>
- <jar destfile="${project.build.directory}/${artifactId}-test-weaving-interceptions.jar"
+ <jar destfile="${project.build.directory}/${project.artifactId}-test-weaving-interceptions.jar"
basedir="${project.build.testOutputDirectory}"
includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/interceptions/*.class"/>
<delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded"/>
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/aspects/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -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>
Modified: projects/aop/trunk/deployers/pom.xml
===================================================================
--- projects/aop/trunk/deployers/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/deployers/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -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>
Modified: projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/jrockit-pluggable-instrumentor/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -10,12 +10,12 @@
<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/trunk/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/trunk/pluggable-instrumentor/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/pluggable-instrumentor/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -11,7 +11,7 @@
<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/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2010-03-16 21:00:11 UTC (rev 102486)
+++ projects/aop/trunk/pom.xml 2010-03-16 21:17:22 UTC (rev 102487)
@@ -42,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>
@@ -65,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>
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.1</version>
<configuration>
<!-- No way to get resource directory using properties http://jira.codehaus.org/browse/MNG-3638 -->
<excludeFilterFile>${project.build.sourceDirectory}/../resources/findbugs/exclude.xml</excludeFilterFile>
@@ -379,6 +379,10 @@
<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>
More information about the jboss-cvs-commits
mailing list