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
This commit is contained in:
parent
f6003b5102
commit
963b4e49a9
|
|
@ -17,7 +17,7 @@ configure(allprojects) {
|
||||||
sourceCompatibility=1.5
|
sourceCompatibility=1.5
|
||||||
targetCompatibility=1.5
|
targetCompatibility=1.5
|
||||||
|
|
||||||
slf4jLog4jVersion = '1.5.10'
|
ext.slf4jLog4jVersion = '1.5.10'
|
||||||
|
|
||||||
[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
|
[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
|
||||||
|
|
||||||
|
|
@ -85,7 +85,7 @@ configure(subprojects) { subproject ->
|
||||||
|
|
||||||
project("spring-asm") {
|
project("spring-asm") {
|
||||||
description = 'Spring ASM'
|
description = 'Spring ASM'
|
||||||
asmVersion = '2.2.3'
|
ext.asmVersion = '2.2.3'
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
asm
|
asm
|
||||||
|
|
@ -542,7 +542,7 @@ configure(rootProject) {
|
||||||
description = "Builds -${classifier} archive, containing all jars and docs, " +
|
description = "Builds -${classifier} archive, containing all jars and docs, " +
|
||||||
"suitable for community download page."
|
"suitable for community download page."
|
||||||
|
|
||||||
baseDir = "${project.name}-${project.version}";
|
def baseDir = "${project.name}-${project.version}";
|
||||||
|
|
||||||
from('src/dist') {
|
from('src/dist') {
|
||||||
include 'readme.txt'
|
include 'readme.txt'
|
||||||
|
|
@ -581,7 +581,7 @@ configure(rootProject) {
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
task wrapper(type: Wrapper) {
|
||||||
description = 'Generates gradlew[.bat] scripts'
|
description = 'Generates gradlew[.bat] scripts'
|
||||||
gradleVersion = '1.0-milestone-8a'
|
gradleVersion = '1.0-rc-1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#Thu Feb 23 13:43:17 CET 2012
|
#Sat Apr 14 10:56:11 EEST 2012
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
|
|
||||||
optionalDeps = []
|
ext.optionalDeps = []
|
||||||
providedDeps = []
|
ext.providedDeps = []
|
||||||
|
|
||||||
optional = { optionalDeps << it }
|
ext.optional = { optionalDeps << it }
|
||||||
provided = { providedDeps << it }
|
ext.provided = { providedDeps << it }
|
||||||
|
|
||||||
install {
|
install {
|
||||||
repositories.mavenInstaller {
|
repositories.mavenInstaller {
|
||||||
|
|
|
||||||
|
|
@ -13,15 +13,15 @@ dependencies {
|
||||||
jibx "bcel:bcel:5.1"
|
jibx "bcel:bcel:5.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
genSourcesDir = "${buildDir}/generated-sources"
|
ext.genSourcesDir = "${buildDir}/generated-sources"
|
||||||
flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
|
ext.flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
|
||||||
|
|
||||||
task genCastor {
|
task genCastor {
|
||||||
orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
|
def orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
|
||||||
castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
|
def castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
|
||||||
|
|
||||||
sourcesDir = "${genSourcesDir}/castor"
|
ext.sourcesDir = "${genSourcesDir}/castor"
|
||||||
classesDir = "${buildDir}/classes/castor"
|
ext.classesDir = "${buildDir}/classes/castor"
|
||||||
|
|
||||||
inputs.files flightSchema, orderSchema, castorBuilderProperties
|
inputs.files flightSchema, orderSchema, castorBuilderProperties
|
||||||
outputs.dir classesDir
|
outputs.dir classesDir
|
||||||
|
|
@ -56,8 +56,8 @@ task genCastor {
|
||||||
}
|
}
|
||||||
|
|
||||||
task genJaxb {
|
task genJaxb {
|
||||||
sourcesDir = "${genSourcesDir}/jaxb"
|
ext.sourcesDir = "${genSourcesDir}/jaxb"
|
||||||
classesDir = "${buildDir}/classes/jaxb"
|
ext.classesDir = "${buildDir}/classes/jaxb"
|
||||||
|
|
||||||
inputs.files flightSchema
|
inputs.files flightSchema
|
||||||
outputs.dir classesDir
|
outputs.dir classesDir
|
||||||
|
|
@ -92,7 +92,7 @@ task genJaxb {
|
||||||
}
|
}
|
||||||
|
|
||||||
task genXmlbeans {
|
task genXmlbeans {
|
||||||
classesDir = "${buildDir}/classes/xmlbeans"
|
ext.classesDir = "${buildDir}/classes/xmlbeans"
|
||||||
|
|
||||||
inputs.files flightSchema
|
inputs.files flightSchema
|
||||||
outputs.dir classesDir
|
outputs.dir classesDir
|
||||||
|
|
@ -112,7 +112,7 @@ task genXmlbeans {
|
||||||
|
|
||||||
// add jibx binding to the normal test compilation process
|
// add jibx binding to the normal test compilation process
|
||||||
compileTestJava {
|
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() {
|
doLast() {
|
||||||
project.ant {
|
project.ant {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue