diff --git a/aspects/spring-security-aspects.gradle b/aspects/spring-security-aspects.gradle index 51ba3fcb67..6b50ef7235 100644 --- a/aspects/spring-security-aspects.gradle +++ b/aspects/spring-security-aspects.gradle @@ -19,3 +19,7 @@ sourceSets.test.aspectj.srcDir "src/test/java" sourceSets.test.java.srcDirs = files() compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml" + +aspectj { + version = aspectjVersion +} diff --git a/gradle.properties b/gradle.properties index 45764ce4e9..fb5c958a36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +aspectjVersion=1.9.3 gaeVersion=1.9.75 springBootVersion=2.2.0.M3 version=5.2.0.BUILD-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index bea01d658b..b221730670 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -141,9 +141,9 @@ dependencyManagement { dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.44' dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23' dependency 'org.apache.tomcat:tomcat-annotations-api:8.5.23' - dependency 'org.aspectj:aspectjrt:1.9.3' - dependency 'org.aspectj:aspectjtools:1.9.3' - dependency 'org.aspectj:aspectjweaver:1.9.3' + dependency "org.aspectj:aspectjrt:$aspectjVersion" + dependency "org.aspectj:aspectjtools:$aspectjVersion" + dependency "org.aspectj:aspectjweaver:$aspectjVersion" dependency 'org.assertj:assertj-core:3.12.2' dependency 'org.attoparser:attoparser:2.0.4.RELEASE' dependency 'org.bouncycastle:bcpkix-jdk15on:1.62' diff --git a/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle b/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle index cba74cbdbe..6487a14d43 100644 --- a/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle +++ b/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle @@ -13,3 +13,8 @@ dependencies { runtime project(':spring-security-aspects') } + +aspectj { + version = aspectjVersion +} + diff --git a/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle b/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle index 5ec643637f..dfc2b98418 100644 --- a/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle +++ b/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle @@ -9,3 +9,8 @@ dependencies { runtime project(':spring-security-aspects') runtime project(':spring-security-config') } + +aspectj { + version = aspectjVersion +} +