From ac45aa202235bfc9826017fe7f37d043b59a75c7 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Mon, 25 Sep 2017 13:50:50 +0200
Subject: [PATCH] Upgrade to AspectJ 1.9 beta 7 (with 1.8.10 exposed in POMs)

Issue: SPR-15974
---
 build.gradle                         | 2 +-
 spring-aop/spring-aop.gradle         | 1 +
 spring-aspects/spring-aspects.gradle | 6 +++---
 spring-context/spring-context.gradle | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 64168a554353..4da69ac8123d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.aspectjVersion       = "1.9.0.BETA-6"
+	ext.aspectjVersion       = "1.8.10"
 	ext.freemarkerVersion    = "2.3.26-incubating"
 	ext.groovyVersion        = "2.4.12"
 	ext.hsqldbVersion        = "2.4.0"
diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle
index a9dca5b8ad9d..069d5f8b463b 100644
--- a/spring-aop/spring-aop.gradle
+++ b/spring-aop/spring-aop.gradle
@@ -6,4 +6,5 @@ dependencies {
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	optional("org.apache.commons:commons-pool2:2.4.2")
 	optional("com.jamonapi:jamon:2.81")
+	testRuntime("org.aspectj:aspectjweaver:1.9.0.BETA-7")  // for JDK 9 build compatibility
 }
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 69169dcd6214..1e531ad2d28e 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -87,9 +87,9 @@ compileTestJava  {
 
 dependencies {
 	aspects(project(":spring-orm"))
-	ajc("org.aspectj:aspectjtools:${aspectjVersion}")
-	rt("org.aspectj:aspectjrt:${aspectjVersion}")
-	compile("org.aspectj:aspectjweaver:${aspectjVersion}")
+	ajc("org.aspectj:aspectjtools:1.9.0.BETA-7")  // for JDK 9 build compatibility
+	rt("org.aspectj:aspectjrt:1.9.0.BETA-7")  // for JDK 9 build compatibility
+	compile("org.aspectj:aspectjweaver:${aspectjVersion}")  // for Maven POM exposure
 	optional(project(":spring-aop"))  // for @Async support
 	optional(project(":spring-beans"))  // for @Configurable support
 	optional(project(":spring-context"))  // for @Enable* support
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index d8df8121a397..12fd05fcce75 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -5,8 +5,8 @@ apply plugin: "groovy"
 dependencies {
 	compile(project(":spring-aop"))
 	compile(project(":spring-beans"))
-	compile(project(":spring-expression"))
 	compile(project(':spring-core'))
+	compile(project(":spring-expression"))
 	optional(project(":spring-instrument"))
 	optional("javax.annotation:javax.annotation-api:1.3.1")
 	optional("javax.ejb:javax.ejb-api:3.2")
@@ -16,11 +16,11 @@ dependencies {
 	optional("javax.money:money-api:1.0.1")
 	optional("javax.validation:validation-api:1.1.0.Final")
 	optional("javax.xml.ws:jaxws-api:2.3.0")
-	optional("org.hibernate:hibernate-validator:5.4.1.Final")
-	optional("joda-time:joda-time:2.9.9")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	optional("org.beanshell:bsh:2.0b5")
+	optional("joda-time:joda-time:2.9.9")
+	optional("org.hibernate:hibernate-validator:5.4.1.Final")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	testCompile("org.apache.commons:commons-pool2:2.4.2")
@@ -29,4 +29,5 @@ dependencies {
 	testRuntime("javax.xml.bind:jaxb-api:2.3.0")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
 	testRuntime("org.javamoney:moneta:1.1")
+	testRuntime("org.aspectj:aspectjweaver:1.9.0.BETA-7")  // for JDK 9 build compatibility
 }