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")