Skip to content

Commit

Permalink
Upgrade to Gradle 1.0-rc1
Browse files Browse the repository at this point in the history
 - 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
  • Loading branch information
cbeams committed Apr 14, 2012
1 parent f6003b5 commit 963b4e4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down Expand Up @@ -85,7 +85,7 @@ configure(subprojects) { subproject ->

project("spring-asm") {
description = 'Spring ASM'
asmVersion = '2.2.3'
ext.asmVersion = '2.2.3'

configurations {
asm
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
}
}

4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions publish-maven.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
20 changes: 10 additions & 10 deletions spring-oxm/oxm.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -92,7 +92,7 @@ task genJaxb {
}

task genXmlbeans {
classesDir = "${buildDir}/classes/xmlbeans"
ext.classesDir = "${buildDir}/classes/xmlbeans"

inputs.files flightSchema
outputs.dir classesDir
Expand All @@ -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 {
Expand Down

0 comments on commit 963b4e4

Please sign in to comment.