root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgraded to AspectJ 1.6.5 and fixes some maven plugin config bugs

This commit is contained in:
Mike Wiesner 2009-09-04 15:25:23 +00:00
parent a1751aec2c
commit ed0686cacf
3 changed files with 85 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
aspects/pom.xml
View File

@ -19,7 +19,6 @@
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>
@ -31,7 +30,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId> <artifactId>aspectj-maven-plugin</artifactId>
<version>1.0</version> <version>1.2</version>
<dependencies> <dependencies>
<!-- <!--
NB: You must use Maven 2.0.9 or above or these NB: You must use Maven 2.0.9 or above or these
@ -39,13 +38,13 @@
--> -->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.runtime</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.6.3.RELEASE</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.tools</artifactId> <artifactId>aspectjtools</artifactId>
<version>1.6.3.RELEASE</version> <version>1.6.5</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
@ -57,8 +56,8 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<source>1.6</source> <source>1.5</source>
<target>1.6</target> <target>1.5</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
pom.xml
View File

@ -661,12 +661,12 @@
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.6.4</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.6.4</version> <version>1.6.5</version>
</dependency> </dependency>
<!-- Used by SPEL <!-- Used by SPEL

27
samples/aspectj/pom.xml
View File

@ -36,33 +36,24 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId> <artifactId>aspectj-maven-plugin</artifactId>
<version>1.0</version> <version>1.2</version>
<dependencies> <dependencies>
<!-- <!--
NB: You must use Maven 2.0.9 or above or these are ignored (see NB: You must use Maven 2.0.9 or above or these
MNG-2972) are ignored (see MNG-2972)
--> -->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.runtime</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.6.3.RELEASE</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.tools</artifactId> <artifactId>aspectjtools</artifactId>
<version>1.6.3.RELEASE</version> <version>1.6.5</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
@ -80,8 +71,8 @@
<artifactId>spring-security-aspects</artifactId> <artifactId>spring-security-aspects</artifactId>
</aspectLibrary> </aspectLibrary>
</aspectLibraries> </aspectLibraries>
<source>1.6</source> <source>1.5</source>
<target>1.6</target> <target>1.5</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>