diff --git a/build.gradle b/build.gradle index 15ca073f14..bbdbb1827a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { configure(allprojects) { project -> group = "org.springframework" version = qualifyVersionIfNecessary(version) - + // The following is a work-around until the Gradle build uses // Ant 1.9.x by default. This is necessary to avoid the // "Class not found: javac1.8" issue with Ant versions prior to 1.9.x @@ -155,7 +155,7 @@ project("spring-build-src") { dependencies { compile gradleApi() - groovy localGroovy() + compile localGroovy() } configurations.archives.artifacts.clear() @@ -959,7 +959,7 @@ configure(rootProject) { task wrapper(type: Wrapper) { description = "Generates gradlew[.bat] scripts" - gradleVersion = "1.3" + gradleVersion = "1.6" doLast() { def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b6b646b0c0..42d9b0e9c5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8281bd16ba..7f7475155b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 28 09:14:59 PST 2012 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME +#Mon May 13 17:38:05 CDT 2013 zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip diff --git a/spring-aspects/aspects.gradle b/spring-aspects/aspects.gradle index 9288f1bbc9..faea8f2855 100644 --- a/spring-aspects/aspects.gradle +++ b/spring-aspects/aspects.gradle @@ -12,8 +12,8 @@ configurations { tasks.getByName("idea").onlyIf { false } tasks.getByName("ideaModule").onlyIf { false } -task compileJava(overwrite: true) { - dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME +compileJava { + actions = [] dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava") def outputDir = project.sourceSets.main.output.classesDir @@ -44,8 +44,8 @@ task compileJava(overwrite: true) { } } -task compileTestJava(overwrite: true) { - dependsOn JavaPlugin.PROCESS_TEST_RESOURCES_TASK_NAME +compileTestJava { + actions = [] dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileTestJava") dependsOn jar