Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Tomcat 8.5.30

Browse Source
This commit is contained in:
Juergen Hoeller
2018-04-11 16:27:34 +02:00
parent 861b9dc938
commit 96a465a749
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -59,7 +59,7 @@ configure(allprojects) { project ->
ext.rxjava2Version = "2.1.12" ext.rxjava2Version = "2.1.12"
ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
ext.tiles3Version = "3.0.8" ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.29" ext.tomcatVersion = "8.5.30"
ext.undertowVersion = "1.4.23.Final" ext.undertowVersion = "1.4.23.Final"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle" ext.gradleScriptDir = "${rootProject.projectDir}/gradle"

2
spring-core/spring-core.gradle
View File

@@ -40,7 +40,7 @@ task cglibRepackJar(type: Jar) { repackJar ->
} }
// Repackage net.sf.cglib => org.springframework.cglib // Repackage net.sf.cglib => org.springframework.cglib
rule(pattern: "net.sf.cglib.**", result: "org.springframework.cglib.@1") rule(pattern: "net.sf.cglib.**", result: "org.springframework.cglib.@1")
// As mentioned above, transform cglib"s internal asm dependencies from // As mentioned above, transform cglib's internal asm dependencies from
// org.objectweb.asm => org.springframework.asm. Doing this counts on the // org.objectweb.asm => org.springframework.asm. Doing this counts on the
// the fact that Spring and cglib depend on the same version of asm! // the fact that Spring and cglib depend on the same version of asm!
rule(pattern: "org.objectweb.asm.**", result: "org.springframework.asm.@1") rule(pattern: "org.objectweb.asm.**", result: "org.springframework.asm.@1")