Skip to content

Commit 963b4e4

Browse files
committed
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
1 parent f6003b5 commit 963b4e4

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ configure(allprojects) {
1717
sourceCompatibility=1.5
1818
targetCompatibility=1.5
1919

20-
slf4jLog4jVersion = '1.5.10'
20+
ext.slf4jLog4jVersion = '1.5.10'
2121

2222
[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
2323

@@ -85,7 +85,7 @@ configure(subprojects) { subproject ->
8585

8686
project("spring-asm") {
8787
description = 'Spring ASM'
88-
asmVersion = '2.2.3'
88+
ext.asmVersion = '2.2.3'
8989

9090
configurations {
9191
asm
@@ -542,7 +542,7 @@ configure(rootProject) {
542542
description = "Builds -${classifier} archive, containing all jars and docs, " +
543543
"suitable for community download page."
544544

545-
baseDir = "${project.name}-${project.version}";
545+
def baseDir = "${project.name}-${project.version}";
546546

547547
from('src/dist') {
548548
include 'readme.txt'
@@ -581,7 +581,7 @@ configure(rootProject) {
581581

582582
task wrapper(type: Wrapper) {
583583
description = 'Generates gradlew[.bat] scripts'
584-
gradleVersion = '1.0-milestone-8a'
584+
gradleVersion = '1.0-rc-1'
585585
}
586586
}
587587

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Feb 23 13:43:17 CET 2012
1+
#Sat Apr 14 10:56:11 EEST 2012
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8a-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-rc-1-bin.zip

publish-maven.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'maven'
22

3-
optionalDeps = []
4-
providedDeps = []
3+
ext.optionalDeps = []
4+
ext.providedDeps = []
55

6-
optional = { optionalDeps << it }
7-
provided = { providedDeps << it }
6+
ext.optional = { optionalDeps << it }
7+
ext.provided = { providedDeps << it }
88

99
install {
1010
repositories.mavenInstaller {

spring-oxm/oxm.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ dependencies {
1313
jibx "bcel:bcel:5.1"
1414
}
1515

16-
genSourcesDir = "${buildDir}/generated-sources"
17-
flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
16+
ext.genSourcesDir = "${buildDir}/generated-sources"
17+
ext.flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
1818

1919
task genCastor {
20-
orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
21-
castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
20+
def orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
21+
def castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
2222

23-
sourcesDir = "${genSourcesDir}/castor"
24-
classesDir = "${buildDir}/classes/castor"
23+
ext.sourcesDir = "${genSourcesDir}/castor"
24+
ext.classesDir = "${buildDir}/classes/castor"
2525

2626
inputs.files flightSchema, orderSchema, castorBuilderProperties
2727
outputs.dir classesDir
@@ -56,8 +56,8 @@ task genCastor {
5656
}
5757

5858
task genJaxb {
59-
sourcesDir = "${genSourcesDir}/jaxb"
60-
classesDir = "${buildDir}/classes/jaxb"
59+
ext.sourcesDir = "${genSourcesDir}/jaxb"
60+
ext.classesDir = "${buildDir}/classes/jaxb"
6161

6262
inputs.files flightSchema
6363
outputs.dir classesDir
@@ -92,7 +92,7 @@ task genJaxb {
9292
}
9393

9494
task genXmlbeans {
95-
classesDir = "${buildDir}/classes/xmlbeans"
95+
ext.classesDir = "${buildDir}/classes/xmlbeans"
9696

9797
inputs.files flightSchema
9898
outputs.dir classesDir
@@ -112,7 +112,7 @@ task genXmlbeans {
112112

113113
// add jibx binding to the normal test compilation process
114114
compileTestJava {
115-
bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
115+
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
116116

117117
doLast() {
118118
project.ant {

0 commit comments

Comments
 (0)