@@ -55,6 +55,7 @@ configure(allprojects) { project ->
55
55
ext. jrubyVersion = " 1.7.25" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
56
56
ext. jtaVersion = " 1.2"
57
57
ext. junitVersion = " 4.12"
58
+ ext. log4jVersion = " 1.2.17"
58
59
ext. nettyVersion = " 4.0.37.Final"
59
60
ext. okhttpVersion = " 2.7.5"
60
61
ext. openjpaVersion = " 2.4.1"
@@ -67,7 +68,7 @@ configure(allprojects) { project ->
67
68
ext. testngVersion = " 6.9.10"
68
69
ext. tiles2Version = " 2.2.2"
69
70
ext. tiles3Version = " 3.0.5"
70
- ext. tomcatVersion = " 8.0.35 "
71
+ ext. tomcatVersion = " 8.0.36 "
71
72
ext. tyrusVersion = " 1.3.5" // constrained by WebLogic 12.1.3 support
72
73
ext. undertowVersion = " 1.3.23.Final"
73
74
ext. xmlunitVersion = " 1.6"
@@ -283,7 +284,7 @@ project("spring-core") {
283
284
// both into the spring-core jar. cglib 3.2 itself depends on asm 5.0 and is therefore
284
285
// further transformed by the JarJar task to depend on org.springframework.asm; this
285
286
// avoids including two different copies of asm unnecessarily.
286
- def cglibVersion = " 3.2.2 "
287
+ def cglibVersion = " 3.2.4 "
287
288
def objenesisVersion = " 2.2"
288
289
289
290
configurations {
@@ -345,7 +346,7 @@ project("spring-core") {
345
346
optional(" commons-codec:commons-codec:1.10" )
346
347
optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
347
348
optional(" net.sf.jopt-simple:jopt-simple:4.9" )
348
- optional(" log4j:log4j:1.2.17 " )
349
+ optional(" log4j:log4j:${ log4jVersion } " )
349
350
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
350
351
testCompile(" xmlunit:xmlunit:${ xmlunitVersion} " )
351
352
testCompile(" com.fasterxml.woodstox:woodstox-core:5.0.2" ) {
@@ -376,7 +377,7 @@ project("spring-beans") {
376
377
optional(" javax.inject:javax.inject:1" )
377
378
optional(" javax.el:javax.el-api:2.2.5" )
378
379
optional(" org.yaml:snakeyaml:${ snakeyamlVersion} " )
379
- testCompile(" log4j:log4j:1.2.17 " )
380
+ testCompile(" log4j:log4j:${ log4jVersion } " )
380
381
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
381
382
}
382
383
}
@@ -523,7 +524,7 @@ project("spring-messaging") {
523
524
testCompile(" org.apache.tomcat.embed:tomcat-embed-logging-juli:${ tomcatVersion} " )
524
525
testCompile(" io.netty:netty-all:${ nettyVersion} " )
525
526
testCompile(" commons-dbcp:commons-dbcp:1.4" )
526
- testCompile(" log4j:log4j:1.2.17 " )
527
+ testCompile(" log4j:log4j:${ log4jVersion } " )
527
528
testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
528
529
testCompile(" xmlunit:xmlunit:${ xmlunitVersion} " )
529
530
}
@@ -709,7 +710,7 @@ project("spring-web") {
709
710
optional(" org.eclipse.jetty:jetty-server:${ jettyVersion} " ) {
710
711
exclude group : " javax.servlet" , module : " javax.servlet-api"
711
712
}
712
- optional(" log4j:log4j:1.2.17 " )
713
+ optional(" log4j:log4j:${ log4jVersion } " )
713
714
optional(" com.google.protobuf:protobuf-java:2.6.1" )
714
715
optional(" com.googlecode.protobuf-java-format:protobuf-java-format:1.2" )
715
716
optional(" javax.mail:javax.mail-api:${ javamailVersion} " )
@@ -973,7 +974,7 @@ project("spring-websocket") {
973
974
testCompile(" org.apache.tomcat.embed:tomcat-embed-logging-juli:${ tomcatVersion} " )
974
975
testCompile(" io.projectreactor:reactor-net:${ reactorVersion} " )
975
976
testCompile(" io.netty:netty-all:${ nettyVersion} " )
976
- testCompile(" log4j:log4j:1.2.17 " )
977
+ testCompile(" log4j:log4j:${ log4jVersion } " )
977
978
testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
978
979
}
979
980
}
@@ -1031,6 +1032,7 @@ project("spring-test") {
1031
1032
testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
1032
1033
testCompile(" org.apache.httpcomponents:httpclient:${ httpclientVersion} " )
1033
1034
testCompile(" javax.cache:cache-api:1.0.0" )
1035
+ testRuntime(" log4j:log4j:${ log4jVersion} " )
1034
1036
testRuntime(" org.ehcache:ehcache:${ ehcache3Version} " )
1035
1037
testRuntime(" org.terracotta:management-model:2.0.0" )
1036
1038
}
0 commit comments