From ed0686cacfe189a89a00cab6afe3e2a70bfab738 Mon Sep 17 00:00:00 2001
From: Mike Wiesner <mike.wiesner@springsource.com>
Date: Fri, 4 Sep 2009 15:25:23 +0000
Subject: [PATCH] Upgraded to AspectJ 1.6.5 and fixes some maven plugin config
 bugs

---
 aspects/pom.xml         |  15 ++--
 pom.xml                 |   4 +-
 samples/aspectj/pom.xml | 161 +++++++++++++++++++---------------------
 3 files changed, 85 insertions(+), 95 deletions(-)

diff --git a/aspects/pom.xml b/aspects/pom.xml
index ec739b485d..16c616ba92 100644
--- a/aspects/pom.xml
+++ b/aspects/pom.xml
@@ -19,7 +19,6 @@
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -31,7 +30,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.0</version>
+                <version>1.2</version>
                 <dependencies>
                     <!--
                         NB: You must use Maven 2.0.9 or above or these
@@ -39,13 +38,13 @@
                     -->
                     <dependency>
                         <groupId>org.aspectj</groupId>
-                        <artifactId>com.springsource.org.aspectj.runtime</artifactId>
-                        <version>1.6.3.RELEASE</version>
+                        <artifactId>aspectjrt</artifactId>
+                        <version>1.6.5</version>
                     </dependency>
                     <dependency>
                         <groupId>org.aspectj</groupId>
-                        <artifactId>com.springsource.org.aspectj.tools</artifactId>
-                        <version>1.6.3.RELEASE</version>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>1.6.5</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -57,8 +56,8 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.5</source>
+                    <target>1.5</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 9d738b9137..8c9af0434b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -661,12 +661,12 @@
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjrt</artifactId>
-                <version>1.6.4</version>
+                <version>1.6.5</version>
             </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjweaver</artifactId>
-                <version>1.6.4</version>
+                <version>1.6.5</version>
             </dependency>
 
 <!-- Used by SPEL
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index 5226197829..267123f035 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -1,89 +1,80 @@
 <?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"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.security</groupId>
-		<artifactId>spring-security-parent</artifactId>
-		<version>3.0.0.CI-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-security-samples-aspectj</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Security Sample AspectJ</name>
-	<dependencies>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-parent</artifactId>
+        <version>3.0.0.CI-SNAPSHOT</version>
+    </parent>
+    <artifactId>spring-security-samples-aspectj</artifactId>
+    <packaging>jar</packaging>
+    <name>Spring Security Sample AspectJ</name>
+    <dependencies>
 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.6</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-aspects</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<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>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.0</version>
-				<dependencies>
-					<!--
-						NB: You must use Maven 2.0.9 or above or these are ignored (see
-						MNG-2972)
-					-->
-					<dependency>
-						<groupId>org.aspectj</groupId>
-						<artifactId>com.springsource.org.aspectj.runtime</artifactId>
-						<version>1.6.3.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>org.aspectj</groupId>
-						<artifactId>com.springsource.org.aspectj.tools</artifactId>
-						<version>1.6.3.RELEASE</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<goals>
-							<goal>compile</goal>
-							<goal>test-compile</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<aspectLibraries>
-						<aspectLibrary>
-							<groupId>org.springframework.security</groupId>
-							<artifactId>spring-security-aspects</artifactId>
-						</aspectLibrary>
-					</aspectLibraries>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-aspects</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>aspectj-maven-plugin</artifactId>
+                <version>1.2</version>
+                <dependencies>
+                    <!--
+                        NB: You must use Maven 2.0.9 or above or these
+                        are ignored (see MNG-2972)
+                    -->
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjrt</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <aspectLibraries>
+                        <aspectLibrary>
+                            <groupId>org.springframework.security</groupId>
+                            <artifactId>spring-security-aspects</artifactId>
+                        </aspectLibrary>
+                    </aspectLibraries>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>