From 5ccbc80522eba5a2f0b38a44aac16e7e9c7e7770 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 30 Jul 2013 15:42:23 +0200
Subject: [PATCH] Upgraded to AspectJ 1.8.0.M1

Issue: SPR-10558
---
 build.gradle | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 74dfea9f528..f750ee50ad6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,12 +12,7 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	// The following is a work-around until the Gradle build uses
-	// Ant 1.9.x by default. This is necessary to avoid the
-	// "Class not found: javac1.8" issue with Ant versions prior to 1.9.x
-	ant.properties["build.compiler"] = "javac1.7"
-
-	ext.aspectjVersion  = "1.7.2"
+	ext.aspectjVersion  = "1.8.0.M1"
 	ext.hsqldbVersion   = "1.8.0.10"
 	ext.junitVersion    = "4.11"
 	ext.slf4jVersion    = "1.6.1"
@@ -70,6 +65,7 @@ configure(allprojects) { project ->
 
 	repositories {
 		maven { url "http://repo.springsource.org/libs-release" }
+        maven { url "http://maven.springframework.org/milestone" }
 	}
 
 	dependencies {
@@ -356,7 +352,12 @@ project("spring-oxm") {
 	description = "Spring Object/XML Marshalling"
 	apply from: "oxm.gradle"
 
-	compileTestJava {
+    // The following is a work-around until the Gradle build uses
+    // Ant 1.9.x by default. This is necessary to avoid the genCastor
+    // "Class not found: javac1.8" issue with Ant versions prior to 1.9.x
+    ant.properties["build.compiler"] = "javac1.7"
+
+    compileTestJava {
 		// necessary to avoid java.lang.VerifyError on jibx compilation
 		// see http://jira.codehaus.org/browse/JIBX-465
 		sourceCompatibility=1.6