Skip to content

Commit 2dbc8b0

Browse files
committed
Latest applicable dependency updates (EhCache 2.10.2, JRuby 1.7.25, Quartz 2.2.3, Undertow 1.3.22)
1 parent 0f2bc3f commit 2dbc8b0

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

build.gradle

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ configure(allprojects) { project ->
2929

3030
ext.aspectjVersion = "1.8.9"
3131
ext.eclipselinkVersion = "2.4.2"
32-
ext.ehcacheVersion = "2.10.1"
32+
ext.ehcacheVersion = "2.10.2"
3333
ext.ehcachejcacheVersion = "1.0.1"
3434
ext.ehcache3Version = "3.0.0"
35-
ext.ejbApiVersion = "3.0"
35+
ext.ejbVersion = "3.0"
3636
ext.fileuploadVersion = "1.3.1"
3737
ext.freemarkerVersion = "2.3.23"
3838
ext.groovyVersion = "2.4.6"
@@ -45,17 +45,14 @@ configure(allprojects) { project ->
4545
ext.hibval4Version = "4.3.2.Final"
4646
ext.hibval5Version = "5.2.4.Final"
4747
ext.hsqldbVersion = "2.3.3"
48-
ext.htmlunitVersion = "2.19"
4948
ext.httpasyncVersion = "4.1.1"
5049
ext.httpclientVersion = "4.5.2"
5150
ext.jackson2Version = "2.6.6"
5251
ext.jasperreportsVersion = "6.2.1"
5352
ext.javamailVersion = "1.5.5"
5453
ext.jettyVersion = "9.3.8.v20160314"
5554
ext.jodaVersion = "2.9.3"
56-
ext.jrubyVersion = "1.7.24" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
57-
ext.jsonassertVersion = "1.2.3"
58-
ext.jsonpathVersion = "2.1.0"
55+
ext.jrubyVersion = "1.7.25" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
5956
ext.jtaVersion = "1.2"
6057
ext.junitVersion = "4.12"
6158
ext.nettyVersion = "4.0.36.Final"
@@ -64,7 +61,6 @@ configure(allprojects) { project ->
6461
ext.poiVersion = "3.13"
6562
ext.reactorVersion = "2.0.8.RELEASE"
6663
ext.romeVersion = "1.5.1"
67-
ext.seleniumVersion = "2.48.2"
6864
ext.slf4jVersion = "1.7.21"
6965
ext.snakeyamlVersion = "1.17"
7066
ext.snifferVersion = "1.14"
@@ -73,8 +69,7 @@ configure(allprojects) { project ->
7369
ext.tiles3Version = "3.0.5"
7470
ext.tomcatVersion = "8.0.33"
7571
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
76-
ext.undertowVersion = "1.3.21.Final"
77-
ext.woodstoxVersion = "5.0.2"
72+
ext.undertowVersion = "1.3.22.Final"
7873
ext.xmlunitVersion = "1.6"
7974
ext.xstreamVersion = "1.4.9"
8075

@@ -353,7 +348,7 @@ project("spring-core") {
353348
optional("log4j:log4j:1.2.17")
354349
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
355350
testCompile("xmlunit:xmlunit:${xmlunitVersion}")
356-
testCompile("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") {
351+
testCompile("com.fasterxml.woodstox:woodstox-core:5.0.2") {
357352
exclude group: "stax", module: "stax-api"
358353
}
359354
}
@@ -474,7 +469,7 @@ project("spring-context") {
474469
compile(files(project(":spring-core").cglibRepackJar))
475470
optional(project(":spring-instrument"))
476471
optional("javax.inject:javax.inject:1")
477-
optional("javax.ejb:ejb-api:${ejbApiVersion}")
472+
optional("javax.ejb:ejb-api:${ejbVersion}")
478473
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
479474
optional("javax.money:money-api:1.0")
480475
optional("org.eclipse.persistence:javax.persistence:2.0.0")
@@ -545,7 +540,7 @@ project("spring-tx") {
545540
optional("aopalliance:aopalliance:1.0")
546541
optional("javax.transaction:javax.transaction-api:${jtaVersion}")
547542
optional("javax.resource:connector-api:1.5")
548-
optional("javax.ejb:ejb-api:${ejbApiVersion}")
543+
optional("javax.ejb:ejb-api:${ejbVersion}")
549544
optional("com.ibm.websphere:uow:6.0.2.17")
550545
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
551546
testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
@@ -641,7 +636,7 @@ project("spring-context-support") {
641636
optional("javax.cache:cache-api:1.0.0")
642637
optional("com.google.guava:guava:${guavaVersion}")
643638
optional("net.sf.ehcache:ehcache:${ehcacheVersion}")
644-
optional("org.quartz-scheduler:quartz:2.2.2")
639+
optional("org.quartz-scheduler:quartz:2.2.3")
645640
optional("org.codehaus.fabric3.api:commonj:1.1.0")
646641
optional("org.apache.velocity:velocity:1.7")
647642
optional("org.freemarker:freemarker:${freemarkerVersion}")
@@ -1010,15 +1005,15 @@ project("spring-test") {
10101005
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
10111006
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
10121007
optional("org.hamcrest:hamcrest-core:${hamcrestVersion}")
1013-
optional("org.seleniumhq.selenium:selenium-htmlunit-driver:${seleniumVersion}")
1014-
optional("net.sourceforge.htmlunit:htmlunit:${htmlunitVersion}")
10151008
optional("xmlunit:xmlunit:${xmlunitVersion}")
1016-
optional("org.skyscreamer:jsonassert:${jsonassertVersion}")
1017-
optional("com.jayway.jsonpath:json-path:${jsonpathVersion}")
1009+
optional("net.sourceforge.htmlunit:htmlunit:2.19")
1010+
optional("org.seleniumhq.selenium:selenium-htmlunit-driver:2.48.2")
1011+
optional("org.skyscreamer:jsonassert:1.2.3")
1012+
optional("com.jayway.jsonpath:json-path:2.1.0")
10181013
testCompile(project(":spring-context-support"))
10191014
testCompile(project(":spring-oxm"))
10201015
testCompile("javax.mail:javax.mail-api:${javamailVersion}")
1021-
testCompile("javax.ejb:ejb-api:${ejbApiVersion}")
1016+
testCompile("javax.ejb:ejb-api:${ejbVersion}")
10221017
testCompile("org.hibernate:hibernate-core:${hibernate4Version}")
10231018
testCompile("org.hibernate:hibernate-entitymanager:${hibernate4Version}")
10241019
testCompile("org.hibernate:hibernate-validator:${hibval5Version}")

0 commit comments

Comments
 (0)