From 963b4e49a98e85e70989427c3e8faec2e408ba5d Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Sat, 14 Apr 2012 12:37:55 +0300
Subject: [PATCH] Upgrade to Gradle 1.0-rc1

 - Fix deprecation warnings about dynamic properties; favor use of
   "extra properties extensions" per [1]

 - Certain such deprecations are still issued due to violations within
   the docbook-reference plugin. These will be fixed in an upcoming
   revision of the plugin, at which point spring-framework will upgrade
   to depend on it and these warnings will be eliminated

[1] http://gradle.org/docs/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html

Issue: SPR-9327
---
 build.gradle                             |  8 ++++----
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 publish-maven.gradle                     |  8 ++++----
 spring-oxm/oxm.gradle                    | 20 ++++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index d8160986e821..e533a7fe266b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ configure(allprojects) {
     sourceCompatibility=1.5
     targetCompatibility=1.5
 
-    slf4jLog4jVersion = '1.5.10'
+    ext.slf4jLog4jVersion = '1.5.10'
 
     [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
 
@@ -85,7 +85,7 @@ configure(subprojects) { subproject ->
 
 project("spring-asm") {
     description = 'Spring ASM'
-    asmVersion = '2.2.3'
+    ext.asmVersion = '2.2.3'
 
     configurations {
         asm
@@ -542,7 +542,7 @@ configure(rootProject) {
         description = "Builds -${classifier} archive, containing all jars and docs, " +
                       "suitable for community download page."
 
-        baseDir = "${project.name}-${project.version}";
+        def baseDir = "${project.name}-${project.version}";
 
         from('src/dist') {
             include 'readme.txt'
@@ -581,7 +581,7 @@ configure(rootProject) {
 
     task wrapper(type: Wrapper) {
         description = 'Generates gradlew[.bat] scripts'
-        gradleVersion = '1.0-milestone-8a'
+        gradleVersion = '1.0-rc-1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 29e8a275e6d3..d4bfedeca95d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 23 13:43:17 CET 2012
+#Sat Apr 14 10:56:11 EEST 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8a-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-rc-1-bin.zip
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 17a84f86ecf9..0b7c68d198ed 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'maven'
 
-optionalDeps = []
-providedDeps = []
+ext.optionalDeps = []
+ext.providedDeps = []
 
-optional = { optionalDeps << it }
-provided = { providedDeps << it }
+ext.optional = { optionalDeps << it }
+ext.provided = { providedDeps << it }
 
 install {
     repositories.mavenInstaller {
diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index c8dceea4a342..ede4d5cbb39f 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -13,15 +13,15 @@ dependencies {
     jibx "bcel:bcel:5.1"
 }
 
-genSourcesDir = "${buildDir}/generated-sources"
-flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
+ext.genSourcesDir = "${buildDir}/generated-sources"
+ext.flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
 
 task genCastor {
-    orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
-    castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
+    def orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
+    def castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
 
-    sourcesDir = "${genSourcesDir}/castor"
-    classesDir = "${buildDir}/classes/castor"
+    ext.sourcesDir = "${genSourcesDir}/castor"
+    ext.classesDir = "${buildDir}/classes/castor"
 
     inputs.files flightSchema, orderSchema, castorBuilderProperties
     outputs.dir classesDir
@@ -56,8 +56,8 @@ task genCastor {
 }
 
 task genJaxb {
-    sourcesDir = "${genSourcesDir}/jaxb"
-    classesDir = "${buildDir}/classes/jaxb"
+    ext.sourcesDir = "${genSourcesDir}/jaxb"
+    ext.classesDir = "${buildDir}/classes/jaxb"
 
     inputs.files flightSchema
     outputs.dir classesDir
@@ -92,7 +92,7 @@ task genJaxb {
 }
 
 task genXmlbeans {
-    classesDir = "${buildDir}/classes/xmlbeans"
+    ext.classesDir = "${buildDir}/classes/xmlbeans"
 
     inputs.files flightSchema
     outputs.dir classesDir
@@ -112,7 +112,7 @@ task genXmlbeans {
 
 // add jibx binding to the normal test compilation process
 compileTestJava {
-    bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
+    def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
 
     doLast() {
         project.ant {