Permalink
Browse files

PERFFORJ-58,37 : Added compile profile for ajc, upgrade to 1.6.11.

Introduces a Maven Profile "ajc" which can be activated during builds by
passing -Pajc to Maven CLI, which activates aspectj-maven-plugin. This
is indended as a temporary/testing interim for ajc-compilation rather than
a permanent distribution solution.

The AspectJ version is also pulled into a property aspectjVersion at the
same time, and version is updated to 1.6.11.  1.6.1 presents problems with
other changes on this branch when using the ajc compiler.
  • Loading branch information...
1 parent 089c513 commit f8ba123173df9038c8229fe8b494fd16ea49a927 @javabrett javabrett committed Oct 31, 2011
Showing with 35 additions and 4 deletions.
  1. +35 −4 pom.xml
View
39 pom.xml
@@ -196,6 +196,7 @@
<currentProductionVersion>0.9.16</currentProductionVersion>
<currentSnapshotVersion>0.9.17-SNAPSHOT</currentSnapshotVersion>
<git.executable>git</git.executable>
+ <aspectjVersion>1.6.11</aspectjVersion>
</properties>
<profiles>
@@ -210,9 +211,39 @@
<git.executable>git.cmd</git.executable>
</properties>
</profile>
+ <profile>
+ <id>ajc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>1.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>${aspectjVersion}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal> <!-- use this goal to weave all your main classes -->
+ <goal>test-compile</goal> <!-- use this goal to weave all your test classes -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
<dependencies>
<!-- if you use the log4j implementation of perf4j, you must also include this dependency -->
<dependency>
@@ -262,15 +293,15 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.1</version>
+ <version>${aspectjVersion}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.1</version>
+ <version>${aspectjVersion}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -582,7 +613,7 @@
<includes>
<include>**/*Test.java</include>
</includes>
- <argLine>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/1.6.1/aspectjweaver-1.6.1.jar</argLine>
+ <argLine>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjVersion}/aspectjweaver-${aspectjVersion}.jar</argLine>
<systemProperties>
<property>
<name>log4j.debug</name>

0 comments on commit f8ba123

Please sign in to comment.