From 96a465a74988dcacaf3eefce99fcad07ef214339 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 11 Apr 2018 16:27:34 +0200 Subject: [PATCH] Upgrade to Tomcat 8.5.30 --- build.gradle | 2 +- spring-core/spring-core.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3316b934eb7..2a014d3c8a0 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ configure(allprojects) { project -> ext.rxjava2Version = "2.1.12" ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps ext.tiles3Version = "3.0.8" - ext.tomcatVersion = "8.5.29" + ext.tomcatVersion = "8.5.30" ext.undertowVersion = "1.4.23.Final" ext.gradleScriptDir = "${rootProject.projectDir}/gradle" diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 7a5281d7bc4..0d635ad9275 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -40,7 +40,7 @@ task cglibRepackJar(type: Jar) { repackJar -> } // Repackage net.sf.cglib => org.springframework.cglib 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 // the fact that Spring and cglib depend on the same version of asm! rule(pattern: "org.objectweb.asm.**", result: "org.springframework.asm.@1")