From 3f85efe107387f5baf3d53bc8ec59ed71e607315 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 4 May 2016 18:17:16 +0200 Subject: [PATCH] Latest dependency updates (EhCache 2.10.2, HtmlUnit 2.21, JOpt Simple 5.0.1, JRuby 1.7.25, Quartz 2.2.3, Undertow 1.3.22) --- build.gradle | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index dd2b9df80f..3172b24f17 100644 --- a/build.gradle +++ b/build.gradle @@ -34,10 +34,10 @@ configure(allprojects) { project -> ext.aspectjVersion = "1.8.9" ext.caffeineVersion = "2.3.0" ext.eclipselinkVersion = "2.4.2" - ext.ehcacheVersion = "2.10.1" + ext.ehcacheVersion = "2.10.2" ext.ehcachejcacheVersion = "1.0.1" ext.ehcache3Version = "3.0.0" - ext.ejbApiVersion = "3.0" + ext.ejbVersion = "3.0" ext.fileuploadVersion = "1.3.1" ext.freemarkerVersion = "2.3.23" ext.groovyVersion = "2.4.6" @@ -50,7 +50,6 @@ configure(allprojects) { project -> ext.hibval4Version = "4.3.2.Final" ext.hibval5Version = "5.2.4.Final" ext.hsqldbVersion = "2.3.3" - ext.htmlunitVersion = "2.20" ext.httpasyncVersion = "4.1.1" ext.httpclientVersion = "4.5.2" ext.jackson2Version = "2.7.4" @@ -58,9 +57,7 @@ configure(allprojects) { project -> ext.javamailVersion = "1.5.5" ext.jettyVersion = "9.3.8.v20160314" ext.jodaVersion = "2.9.3" - ext.jrubyVersion = "1.7.24" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory) - ext.jsonassertVersion = "1.3.0" - ext.jsonpathVersion = "2.2.0" + ext.jrubyVersion = "1.7.25" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory) ext.jtaVersion = "1.2" ext.junitVersion = "4.12" ext.nettyVersion = "4.1.0.CR7" @@ -70,7 +67,6 @@ configure(allprojects) { project -> ext.poiVersion = "3.14" ext.reactorVersion = "2.0.8.RELEASE" ext.romeVersion = "1.6.0" - ext.seleniumVersion = "2.53.0" ext.slf4jVersion = "1.7.21" ext.snakeyamlVersion = "1.17" ext.snifferVersion = "1.15" @@ -79,8 +75,7 @@ configure(allprojects) { project -> ext.tiles3Version = "3.0.5" ext.tomcatVersion = "8.0.33" ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support - ext.undertowVersion = "1.3.21.Final" - ext.woodstoxVersion = "5.0.2" + ext.undertowVersion = "1.3.22.Final" ext.xmlunitVersion = "1.6" ext.xstreamVersion = "1.4.9" @@ -355,11 +350,11 @@ project("spring-core") { compile("commons-logging:commons-logging:1.2") optional("commons-codec:commons-codec:1.10") optional("org.aspectj:aspectjweaver:${aspectjVersion}") - optional("net.sf.jopt-simple:jopt-simple:5.0") + optional("net.sf.jopt-simple:jopt-simple:5.0.1") optional("log4j:log4j:1.2.17") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("xmlunit:xmlunit:${xmlunitVersion}") - testCompile("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") { + testCompile("com.fasterxml.woodstox:woodstox-core:5.0.2") { exclude group: "stax", module: "stax-api" } } @@ -479,7 +474,7 @@ project("spring-context") { compile(files(project(":spring-core").cglibRepackJar)) optional(project(":spring-instrument")) optional("javax.inject:javax.inject:1") - optional("javax.ejb:ejb-api:${ejbApiVersion}") + optional("javax.ejb:ejb-api:${ejbVersion}") optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0") optional("javax.money:money-api:1.0") optional("org.eclipse.persistence:javax.persistence:2.0.0") @@ -549,7 +544,7 @@ project("spring-tx") { optional(project(":spring-context")) // for JCA, @EnableTransactionManagement optional("javax.transaction:javax.transaction-api:${jtaVersion}") optional("javax.resource:connector-api:1.5") - optional("javax.ejb:ejb-api:${ejbApiVersion}") + optional("javax.ejb:ejb-api:${ejbVersion}") optional("com.ibm.websphere:uow:6.0.2.17") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.eclipse.persistence:javax.persistence:2.0.0") @@ -646,7 +641,7 @@ project("spring-context-support") { optional("com.google.guava:guava:${guavaVersion}") optional("com.github.ben-manes.caffeine:caffeine:${caffeineVersion}") optional("net.sf.ehcache:ehcache:${ehcacheVersion}") - optional("org.quartz-scheduler:quartz:2.2.2") + optional("org.quartz-scheduler:quartz:2.2.3") optional("org.codehaus.fabric3.api:commonj:1.1.0") optional("org.apache.velocity:velocity:1.7") optional("org.freemarker:freemarker:${freemarkerVersion}") @@ -1012,16 +1007,16 @@ project("spring-test") { optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.hamcrest:hamcrest-core:${hamcrestVersion}") - optional("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") - optional("org.seleniumhq.selenium:htmlunit-driver:${htmlunitVersion}") - optional("net.sourceforge.htmlunit:htmlunit:${htmlunitVersion}") optional("xmlunit:xmlunit:${xmlunitVersion}") - optional("org.skyscreamer:jsonassert:${jsonassertVersion}") - optional("com.jayway.jsonpath:json-path:${jsonpathVersion}") + optional("net.sourceforge.htmlunit:htmlunit:2.21") + optional("org.seleniumhq.selenium:htmlunit-driver:2.20") + optional("org.seleniumhq.selenium:selenium-java:2.53.0") + optional("org.skyscreamer:jsonassert:1.3.0") + optional("com.jayway.jsonpath:json-path:2.2.0") testCompile(project(":spring-context-support")) testCompile(project(":spring-oxm")) testCompile("javax.mail:javax.mail-api:${javamailVersion}") - testCompile("javax.ejb:ejb-api:${ejbApiVersion}") + testCompile("javax.ejb:ejb-api:${ejbVersion}") testCompile("org.hibernate:hibernate-core:${hibernate4Version}") testCompile("org.hibernate:hibernate-entitymanager:${hibernate4Version}") testCompile("org.hibernate:hibernate-validator:${hibval5Version}")