Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 17:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to AspectJ 1.6.5 and fixes some maven plugin config bugs

Browse Source
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

161
samples/aspectj/pom.xml
View File

@ -1,89 +1,80 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId> <artifactId>spring-security-parent</artifactId>
<version>3.0.0.CI-SNAPSHOT</version> <version>3.0.0.CI-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-security-samples-aspectj</artifactId> <artifactId>spring-security-samples-aspectj</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spring Security Sample AspectJ</name> <name>Spring Security Sample AspectJ</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.6</version> <version>4.6</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-aspects</artifactId> <artifactId>spring-security-aspects</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>aspectj-maven-plugin</artifactId>
<version>2.0.2</version> <version>1.2</version>
<configuration> <dependencies>
<source>1.6</source> <!--
<target>1.6</target> NB: You must use Maven 2.0.9 or above or these
</configuration> are ignored (see MNG-2972)
</plugin> -->
<plugin> <dependency>
<groupId>org.codehaus.mojo</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.0</version> <version>1.6.5</version>
<dependencies> </dependency>
<!-- <dependency>
NB: You must use Maven 2.0.9 or above or these are ignored (see <groupId>org.aspectj</groupId>
MNG-2972) <artifactId>aspectjtools</artifactId>
--> <version>1.6.5</version>
<dependency> </dependency>
<groupId>org.aspectj</groupId> </dependencies>
<artifactId>com.springsource.org.aspectj.runtime</artifactId> <executions>
<version>1.6.3.RELEASE</version> <execution>
</dependency> <goals>
<dependency> <goal>compile</goal>
<groupId>org.aspectj</groupId> <goal>test-compile</goal>
<artifactId>com.springsource.org.aspectj.tools</artifactId> </goals>
<version>1.6.3.RELEASE</version> </execution>
</dependency> </executions>
</dependencies> <configuration>
<executions> <aspectLibraries>
<execution> <aspectLibrary>
<goals> <groupId>org.springframework.security</groupId>
<goal>compile</goal> <artifactId>spring-security-aspects</artifactId>
<goal>test-compile</goal> </aspectLibrary>
</goals> </aspectLibraries>
</execution> <source>1.5</source>
</executions> <target>1.5</target>
<configuration> </configuration>
<aspectLibraries> </plugin>
<aspectLibrary> </plugins>
<groupId>org.springframework.security</groupId> </build>
<artifactId>spring-security-aspects</artifactId>
</aspectLibrary>
</aspectLibraries>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>