diff --git a/build.gradle b/build.gradle
index ec626a6f7be..eb443f328b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ ext {
 	rxjava2Version       = "2.1.17"
 	slf4jVersion         = "1.7.26"	  // spring-jcl + consistent 3rd party deps
 	tiles3Version        = "3.0.8"
-	tomcatVersion        = "8.5.38"
+	tomcatVersion        = "8.5.39"
 	undertowVersion      = "1.4.27.Final"
 
 	gradleScriptDir = "${rootProject.projectDir}/gradle"
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 8134c5a2b18..26253aa8b1d 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -36,7 +36,7 @@ dependencies {
 	optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
-	optional("com.squareup.okhttp3:okhttp:3.13.1")
+	optional("com.squareup.okhttp3:okhttp:3.12.2")
 	optional("org.apache.httpcomponents:httpclient:4.5.7") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
@@ -73,7 +73,7 @@ dependencies {
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
 	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
-	testCompile("com.squareup.okhttp3:mockwebserver:3.13.1")
+	testCompile("com.squareup.okhttp3:mockwebserver:3.12.2")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.skyscreamer:jsonassert:1.5.0")
 	testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index 789ad9e19c6..a086fa4b57f 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -48,7 +48,7 @@ dependencies {
 	testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
 	testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
 	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
-	testCompile("com.squareup.okhttp3:mockwebserver:3.13.1")
+	testCompile("com.squareup.okhttp3:mockwebserver:3.12.2")
 	testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
 	testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
 	testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")