From fc178ef7c2513c158d121436ca6a64d5bdd58562 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 25 Mar 2019 13:54:15 +0100 Subject: [PATCH] Upgrade to Tomcat 9.0.17 and OkHttp 3.14 --- build.gradle | 2 +- spring-web/spring-web.gradle | 4 ++-- spring-webflux/spring-webflux.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1dd0d5fbe05..98377a7f6c4 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ ext { rxjava2Version = "2.2.7" slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" - tomcatVersion = "9.0.16" + tomcatVersion = "9.0.17" undertowVersion = "2.0.19.Final" gradleScriptDir = "${rootProject.projectDir}/gradle" diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 03bad1cb077..f9e063b98bb 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -38,7 +38,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") - optional("com.squareup.okhttp3:okhttp:3.13.1") + optional("com.squareup.okhttp3:okhttp:3.14.0") optional("org.apache.httpcomponents:httpclient:4.5.7") { exclude group: "commons-logging", module: "commons-logging" } @@ -75,7 +75,7 @@ dependencies { testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") - testCompile("com.squareup.okhttp3:mockwebserver:3.13.1") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index f8903b3c9e9..b2684cd2b90 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -51,7 +51,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") - testCompile("com.squareup.okhttp3:mockwebserver:3.13.1") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")