diff --git a/build.gradle b/build.gradle index 55cea8f240e..01e362cbab8 100644 --- a/build.gradle +++ b/build.gradle @@ -336,7 +336,7 @@ project("spring-context") { optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy-all:1.8.9") optional("org.beanshell:bsh:2.0b4") - optional("org.jruby:jruby:1.7.10") + optional("org.jruby:jruby:1.7.12") testCompile("javax.inject:javax.inject-tck:1") testCompile("commons-dbcp:commons-dbcp:1.3") testCompile("org.slf4j:slf4j-api:${slf4jVersion}") @@ -382,14 +382,24 @@ project("spring-oxm") { dependencies { compile(project(":spring-beans")) compile(project(":spring-core")) - optional("org.codehaus.castor:castor-xml:1.3.2") - optional("org.apache.xmlbeans:xmlbeans:2.6.0") - optional("com.thoughtworks.xstream:xstream:1.4.7") + optional("org.codehaus.castor:castor-xml:1.3.3") { + exclude group: 'stax', module: 'stax-api' + exclude group: "org.springframework", module: "spring-context" + } + optional("org.apache.xmlbeans:xmlbeans:2.6.0") { + exclude group: 'stax', module: 'stax-api' + } + optional("com.thoughtworks.xstream:xstream:1.4.7") { + exclude group: 'xpp3', module: 'xpp3_min' + exclude group: 'xmlpull', module: 'xmlpull' + } optional("org.jibx:jibx-run:1.2.5") testCompile(project(":spring-context")) testCompile("xmlunit:xmlunit:1.3") testCompile("xmlpull:xmlpull:1.1.3.4a") - testCompile("org.codehaus.jettison:jettison:1.0.1") + testCompile("org.codehaus.jettison:jettison:1.0.1") { + exclude group: 'stax', module: 'stax-api' + } testCompile(files(genCastor.classesDir).builtBy(genCastor)) testCompile(files(genJaxb.classesDir).builtBy(genJaxb)) testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans)) @@ -426,7 +436,7 @@ project("spring-jdbc") { optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1") optional("c3p0:c3p0:0.9.1.2") optional("hsqldb:hsqldb:${hsqldbVersion}") - optional("com.h2database:h2:1.0.71") + optional("com.h2database:h2:1.0.79") optional("org.apache.derby:derby:10.5.3.0_1") optional("org.apache.derby:derbyclient:10.5.3.0_1") } @@ -508,8 +518,7 @@ project("spring-orm") { description = "Spring Object/Relational Mapping" compileTestJava { - // necessary to avoid java.lang.VerifyError on toplink compilation - // TODO: remove this block when we remove toplink + // necessary to avoid java.lang.VerifyError on TopLink compilation sourceCompatibility=1.6 targetCompatibility=1.6 } @@ -867,7 +876,7 @@ configure(rootProject) { testCompile("javax.inject:javax.inject:1") testCompile("javax.resource:connector-api:1.5") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") - testCompile("org.hibernate:hibernate-core:4.2.11.Final") + testCompile("org.hibernate:hibernate-core:4.2.12.Final") testCompile("hsqldb:hsqldb:${hsqldbVersion}") } @@ -1038,7 +1047,7 @@ configure(rootProject) { task wrapper(type: Wrapper) { description = "Generates gradlew[.bat] scripts" - gradleVersion = "1.11" + gradleVersion = "1.12" doLast() { def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf1279..0087cd3b186 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 3a182c4f827..7dab6dc93c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 13 00:23:41 CET 2014 +#Wed Apr 30 13:06:57 CEST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip