From fa3a2dc98142d397c8394e93d79749f345c149a7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 8 Oct 2021 19:27:06 +0200
Subject: [PATCH] Upgrade to AspectJ 1.9.8 RC1 for Java 17 support

See gh-27537
---
 build.gradle                         | 2 +-
 spring-aspects/spring-aspects.gradle | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index ef49f6bad0d..e872cdedb5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ configure(allprojects) { project ->
 			}
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
-			dependencySet(group: 'org.aspectj', version: '1.9.7') {
+			dependencySet(group: 'org.aspectj', version: '1.9.8.RC1') {
 				entry 'aspectjrt'
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index ec29638bf5e..0461a8be3fb 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -11,12 +11,12 @@ sourceSets.test.java.srcDirs = files()
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
 
 compileAspectj {
-	sourceCompatibility "1.8"
-	targetCompatibility "1.8"
+	sourceCompatibility "17"
+	targetCompatibility "17"
 }
 compileTestAspectj {
-	sourceCompatibility "1.8"
-	targetCompatibility "1.8"
+	sourceCompatibility "17"
+	targetCompatibility "17"
 }
 
 dependencies {