From 4e3d1fa4e9da90b21c2e19c29037f0d687ee4f3e Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 15 Sep 2021 16:20:48 +0200 Subject: [PATCH] Temporarily downgrade Java compat level for AspectJ classes AspectJ doesn't support JDK17 language level (yet). For the time being, this commit is downgrading the language level for the aspectJ generated classes to 1.8. See gh-27416 --- build.gradle | 2 +- spring-aspects/spring-aspects.gradle | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3cb2fa7f94c..54b192d25bc 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'org.asciidoctor.jvm.convert' version '3.3.2' id 'org.asciidoctor.jvm.pdf' version '3.3.2' id 'de.undercouch.download' version '4.1.2' - id "io.freefair.aspectj" version '6.1.0' apply false + id "io.freefair.aspectj" version '6.2.0' apply false id "com.github.ben-manes.versions" version '0.39.0' id "com.github.johnrengelman.shadow" version '7.0.0' apply false id "me.champeau.jmh" version "0.6.6" apply false diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle index 4ee0ef3fda6..85c84bfd467 100644 --- a/spring-aspects/spring-aspects.gradle +++ b/spring-aspects/spring-aspects.gradle @@ -10,6 +10,15 @@ sourceSets.test.java.srcDirs = files() aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver'] +compileAspectj { + sourceCompatibility "1.8" + targetCompatibility "1.8" +} +compileTestAspectj { + sourceCompatibility "1.8" + targetCompatibility "1.8" +} + dependencies { api("org.aspectj:aspectjweaver") compileOnly("org.aspectj:aspectjrt")