0751b2cbeb
Replace existing 'optional' and 'provided' Spring specific build extensions with a new Gradle propdeps-plugin. Optional and Provided dependencies are now defined use dependency configurations. The new plugin does not currently support the notion of optional runtime dependencies. All optional dependencies are implicitly part of the 'compile' scope. This is an intentional design decision that aims to keep both the plugin and the build simple. Since optional dependencies are non-transitive this restriction should not cause any real problems for existing users. The only existing dependency affected is 'commons-io' in the 'spring-beans' project, however, this was an optional compile scope dependency in the previous Spring 3.1 release. Both provided and optional dependencies are no longer exported from generated eclipse .classpath files. This fixes several tests that would previously fail when running within eclipse. The servlet-api specific elements of ide.gradle are also no longer required. Issue: SPR-9656, SPR-10070
67 lines
2.0 KiB
Groovy
67 lines
2.0 KiB
Groovy
// redefine the compileJava and compileTestJava tasks in order to
|
|
// compile sources with ajc instead of javac
|
|
|
|
configurations {
|
|
ajc
|
|
aspects
|
|
ajInpath
|
|
}
|
|
|
|
task compileJava(overwrite: true) {
|
|
dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME
|
|
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava")
|
|
|
|
def outputDir = project.sourceSets.main.output.classesDir
|
|
|
|
inputs.files(project.sourceSets.main.allSource + project.sourceSets.main.compileClasspath)
|
|
outputs.dir outputDir
|
|
|
|
doLast{
|
|
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
|
|
classpath: configurations.ajc.asPath)
|
|
|
|
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
|
|
maxmem: "1024m", fork: "true", Xlint: "ignore",
|
|
destDir: outputDir.absolutePath,
|
|
aspectPath: configurations.aspects.asPath,
|
|
inpath: configurations.ajInpath.asPath,
|
|
sourceRootCopyFilter: "**/*.java",
|
|
classpath: sourceSets.main.runtimeClasspath.asPath) {
|
|
sourceroots {
|
|
sourceSets.main.java.srcDirs.each {
|
|
pathelement(location:it.absolutePath)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
task compileTestJava(overwrite: true) {
|
|
dependsOn JavaPlugin.PROCESS_TEST_RESOURCES_TASK_NAME
|
|
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileTestJava")
|
|
dependsOn jar
|
|
|
|
def outputDir = project.sourceSets.test.output.classesDir
|
|
|
|
inputs.files(project.sourceSets.test.allSource + project.sourceSets.test.compileClasspath)
|
|
outputs.dir outputDir
|
|
|
|
doLast{
|
|
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
|
|
classpath: configurations.ajc.asPath)
|
|
|
|
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
|
|
maxmem: "1024m", fork: "true", Xlint: "ignore",
|
|
destDir: outputDir.absolutePath,
|
|
aspectPath: jar.archivePath,
|
|
inpath: configurations.ajInpath.asPath,
|
|
classpath: sourceSets.test.runtimeClasspath.asPath + jar.archivePath) {
|
|
sourceroots {
|
|
sourceSets.test.java.srcDirs.each {
|
|
pathelement(location:it.absolutePath)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|