root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade to CGLIB 3.2.5 

Includes Jetty 9.4.2, Netty 4.1.8, Commons I/O 1.4 as well.

Issue: SPR-15147
(cherry picked from commit 0d7b25f)
This commit is contained in:
Juergen Hoeller 2017-03-07 00:51:36 +01:00
parent 0bc59225d8
commit 015e00b5dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -56,13 +56,13 @@ configure(allprojects) { project ->
ext.jasperreportsVersion = "6.2.1" // our tests fail with JR-internal NPEs against 6.2.2 and higher ext.jasperreportsVersion = "6.2.1" // our tests fail with JR-internal NPEs against 6.2.2 and higher
ext.javamailVersion = "1.5.6" ext.javamailVersion = "1.5.6"
ext.jettyVersion = "9.3.14.v20161028" // as of 9.3.15, Jetty has hard Servlet 3.1 requirement ext.jettyVersion = "9.3.14.v20161028" // as of 9.3.15, Jetty has hard Servlet 3.1 requirement
ext.jetty94Version = "9.4.1.v20170120" // for spring-websocket support, optimized for Jetty 9.4 ext.jetty94Version = "9.4.2.v20170220" // for spring-websocket support, optimized for Jetty 9.4
ext.jodaVersion = "2.9.7" ext.jodaVersion = "2.9.7"
ext.jrubyVersion = "1.7.26" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory) ext.jrubyVersion = "1.7.26" // JRuby 9000 primarily supported through JSR-223 (StandardScriptFactory)
ext.jtaVersion = "1.2" ext.jtaVersion = "1.2"
ext.junitVersion = "4.12" ext.junitVersion = "4.12"
ext.log4jVersion = "1.2.17" ext.log4jVersion = "1.2.17"
ext.nettyVersion = "4.1.7.Final" ext.nettyVersion = "4.1.8.Final"
ext.okhttpVersion = "2.7.5" ext.okhttpVersion = "2.7.5"
ext.okhttp3Version = "3.6.0" ext.okhttp3Version = "3.6.0"
ext.openjpaVersion = "2.4.1" ext.openjpaVersion = "2.4.1"
@ -293,7 +293,7 @@ project("spring-core") {
// both into the spring-core jar. cglib 3.2 itself depends on asm 5.x and is therefore // both into the spring-core jar. cglib 3.2 itself depends on asm 5.x and is therefore
// further transformed by the JarJar task to depend on org.springframework.asm; this // further transformed by the JarJar task to depend on org.springframework.asm; this
// avoids including two different copies of asm unnecessarily. // avoids including two different copies of asm unnecessarily.
def cglibVersion = "3.2.4" def cglibVersion = "3.2.5"
def objenesisVersion = "2.5.1" def objenesisVersion = "2.5.1"
configurations { configurations {
@ -874,7 +874,7 @@ project("spring-webmvc") {
testCompile("org.hibernate:hibernate-validator:${hibval4Version}") testCompile("org.hibernate:hibernate-validator:${hibval4Version}")
testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}") testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
testCompile("commons-fileupload:commons-fileupload:${fileuploadVersion}") testCompile("commons-fileupload:commons-fileupload:${fileuploadVersion}")
testCompile("commons-io:commons-io:1.3") testCompile("commons-io:commons-io:1.4")
testCompile("joda-time:joda-time:${jodaVersion}") testCompile("joda-time:joda-time:${jodaVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("org.mozilla:rhino:1.7.7.1") testCompile("org.mozilla:rhino:1.7.7.1")