Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-2207: AspectJPlugin uses compileAspect and compileTestAspect

This commit is contained in:
Rob Winch 2013-07-15 10:14:34 -05:00
parent 07c3fdf8a7
commit 3c9a80433f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy
View File

@ -41,9 +41,7 @@ class AspectJPlugin implements Plugin<Project> {
project.configurations.add('aspectpath') project.configurations.add('aspectpath')
} }
project.tasks.compileJava.deleteAllActions() project.tasks.add(name: 'compileAspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
project.tasks.add(name: 'compileJava', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
dependsOn project.configurations*.getTaskDependencyFromProjectDependency(true, "compileJava") dependsOn project.configurations*.getTaskDependencyFromProjectDependency(true, "compileJava")
dependsOn project.processResources dependsOn project.processResources
@ -52,16 +50,19 @@ class AspectJPlugin implements Plugin<Project> {
outputs.dir(sourceSet.output.classesDir) outputs.dir(sourceSet.output.classesDir)
aspectPath = project.configurations.aspectpath aspectPath = project.configurations.aspectpath
} }
project.tasks.compileJava.deleteAllActions()
project.tasks.compileJava.dependsOn project.tasks.compileAspect
project.tasks.compileTestJava.deleteAllActions()
project.tasks.add(name: 'compileTestJava', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) { project.tasks.add(name: 'compileTestAspect', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) {
dependsOn project.processTestResources, project.compileJava, project.jar dependsOn project.processTestResources, project.compileJava, project.jar
sourceSet = project.sourceSets.test sourceSet = project.sourceSets.test
inputs.files(sourceSet.allSource) inputs.files(sourceSet.allSource)
outputs.dir(sourceSet.output.classesDir) outputs.dir(sourceSet.output.classesDir)
aspectPath = project.files(project.configurations.aspectpath, project.jar.archivePath) aspectPath = project.files(project.configurations.aspectpath, project.jar.archivePath)
} }
project.tasks.compileTestJava.deleteAllActions()
project.tasks.compileTestJava.dependsOn project.tasks.compileTestAspect
project.tasks.withType(GenerateEclipseProject) { project.tasks.withType(GenerateEclipseProject) {
project.eclipse.project.file.whenMerged { p -> project.eclipse.project.file.whenMerged { p ->