Skip to content

Commit f60c6c9

Browse files
committed
Upgrade to CGLIB 3.2.4
Issue: SPR-14385
1 parent 2697425 commit f60c6c9

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

build.gradle

+9-7
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ configure(allprojects) { project ->
5555
ext.jrubyVersion = "1.7.25" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
5656
ext.jtaVersion = "1.2"
5757
ext.junitVersion = "4.12"
58+
ext.log4jVersion = "1.2.17"
5859
ext.nettyVersion = "4.0.37.Final"
5960
ext.okhttpVersion = "2.7.5"
6061
ext.openjpaVersion = "2.4.1"
@@ -67,7 +68,7 @@ configure(allprojects) { project ->
6768
ext.testngVersion = "6.9.10"
6869
ext.tiles2Version = "2.2.2"
6970
ext.tiles3Version = "3.0.5"
70-
ext.tomcatVersion = "8.0.35"
71+
ext.tomcatVersion = "8.0.36"
7172
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
7273
ext.undertowVersion = "1.3.23.Final"
7374
ext.xmlunitVersion = "1.6"
@@ -283,7 +284,7 @@ project("spring-core") {
283284
// both into the spring-core jar. cglib 3.2 itself depends on asm 5.0 and is therefore
284285
// further transformed by the JarJar task to depend on org.springframework.asm; this
285286
// avoids including two different copies of asm unnecessarily.
286-
def cglibVersion = "3.2.2"
287+
def cglibVersion = "3.2.4"
287288
def objenesisVersion = "2.2"
288289

289290
configurations {
@@ -345,7 +346,7 @@ project("spring-core") {
345346
optional("commons-codec:commons-codec:1.10")
346347
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
347348
optional("net.sf.jopt-simple:jopt-simple:4.9")
348-
optional("log4j:log4j:1.2.17")
349+
optional("log4j:log4j:${log4jVersion}")
349350
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
350351
testCompile("xmlunit:xmlunit:${xmlunitVersion}")
351352
testCompile("com.fasterxml.woodstox:woodstox-core:5.0.2") {
@@ -376,7 +377,7 @@ project("spring-beans") {
376377
optional("javax.inject:javax.inject:1")
377378
optional("javax.el:javax.el-api:2.2.5")
378379
optional("org.yaml:snakeyaml:${snakeyamlVersion}")
379-
testCompile("log4j:log4j:1.2.17")
380+
testCompile("log4j:log4j:${log4jVersion}")
380381
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
381382
}
382383
}
@@ -523,7 +524,7 @@ project("spring-messaging") {
523524
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}")
524525
testCompile("io.netty:netty-all:${nettyVersion}")
525526
testCompile("commons-dbcp:commons-dbcp:1.4")
526-
testCompile("log4j:log4j:1.2.17")
527+
testCompile("log4j:log4j:${log4jVersion}")
527528
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
528529
testCompile("xmlunit:xmlunit:${xmlunitVersion}")
529530
}
@@ -709,7 +710,7 @@ project("spring-web") {
709710
optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
710711
exclude group: "javax.servlet", module: "javax.servlet-api"
711712
}
712-
optional("log4j:log4j:1.2.17")
713+
optional("log4j:log4j:${log4jVersion}")
713714
optional("com.google.protobuf:protobuf-java:2.6.1")
714715
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.2")
715716
optional("javax.mail:javax.mail-api:${javamailVersion}")
@@ -973,7 +974,7 @@ project("spring-websocket") {
973974
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}")
974975
testCompile("io.projectreactor:reactor-net:${reactorVersion}")
975976
testCompile("io.netty:netty-all:${nettyVersion}")
976-
testCompile("log4j:log4j:1.2.17")
977+
testCompile("log4j:log4j:${log4jVersion}")
977978
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
978979
}
979980
}
@@ -1031,6 +1032,7 @@ project("spring-test") {
10311032
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
10321033
testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
10331034
testCompile("javax.cache:cache-api:1.0.0")
1035+
testRuntime("log4j:log4j:${log4jVersion}")
10341036
testRuntime("org.ehcache:ehcache:${ehcache3Version}")
10351037
testRuntime("org.terracotta:management-model:2.0.0")
10361038
}

0 commit comments

Comments
 (0)