Use the 'io.freefair.aspectj' gradle plugin

Author: larsgrefer

aspects/spring-security-aspects.gradle

@@ -1,11 +1,21 @@
 apply plugin: 'io.spring.convention.spring-module'
-apply plugin: 'aspectj'
+apply plugin: 'io.freefair.aspectj'
 
 dependencies {
+	compile "org.aspectj:aspectjrt"
 	compile project(':spring-security-core')
 	compile 'org.springframework:spring-beans'
 	compile 'org.springframework:spring-context'
 	compile 'org.springframework:spring-core'
 
 	testCompile 'org.springframework:spring-aop'
+	testAspect sourceSets.main.output
 }
+
+sourceSets.main.aspectj.srcDir "src/main/java"
+sourceSets.main.java.srcDirs = files()
+
+sourceSets.test.aspectj.srcDir "src/test/java"
+sourceSets.test.java.srcDirs = files()
+
+compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml"

aspects/src/main/resources/META-INF/aop.xml

@@ -3,6 +3,7 @@ buildscript {
 		classpath 'io.spring.gradle:spring-build-conventions:0.0.23.RELEASE'
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
 		classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
+		classpath "io.freefair.gradle:aspectj-plugin:3.8.4"
 	}
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-snapshot' }

build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'groovy'
+apply plugin: 'java'
 
 repositories {
 	mavenCentral()

buildSrc/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'io.spring.convention.spring-sample'
-apply plugin: 'aspectj'
+apply plugin: 'io.freefair.aspectj.post-compile-weaving'
 
 repositories {
 	mavenCentral()
@@ -9,7 +9,7 @@ dependencies {
 	compile project(':spring-security-config')
 	compile project(':spring-security-core')
 
-	aspectpath project(':spring-security-aspects')
+	aspect project(':spring-security-aspects')
 
 	runtime project(':spring-security-aspects')
 }

buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy

@@ -1,10 +1,10 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
-apply plugin: 'aspectj'
+apply plugin: 'io.freefair.aspectj.post-compile-weaving'
 
 dependencies {
 	compile project(':spring-security-core')
 
-	aspectpath project(':spring-security-aspects')
+	aspect project(':spring-security-aspects')
 
 	runtime project(':spring-security-aspects')
 	runtime project(':spring-security-config')