From 0ef9568c06ed073e3beb8e8c4375a711ff249480 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 25 Feb 2018 15:38:56 +0100 Subject: [PATCH] Upgrade to OkHttp 3.10 (as well as RxJava 2.1.10 and Caffeine 2.6.2) --- build.gradle | 2 +- spring-context-support/spring-context-support.gradle | 2 +- spring-web/spring-web.gradle | 4 ++-- spring-webflux/spring-webflux.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 18b1d4df70c..abe4de56d96 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ configure(allprojects) { project -> ext.reactorVersion = "Bismuth-SR6" ext.rxjavaVersion = "1.3.6" ext.rxjavaAdapterVersion = "1.2.1" - ext.rxjava2Version = "2.1.9" + ext.rxjava2Version = "2.1.10" ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps ext.tiles3Version = "3.0.8" ext.tomcatVersion = "8.5.28" diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 9da91287e8e..81526998656 100644 --- a/spring-context-support/spring-context-support.gradle +++ b/spring-context-support/spring-context-support.gradle @@ -9,7 +9,7 @@ dependencies { optional("javax.activation:activation:1.1.1") optional("javax.mail:javax.mail-api:1.6.1") optional("javax.cache:cache-api:1.1.0") - optional("com.github.ben-manes.caffeine:caffeine:2.6.1") + optional("com.github.ben-manes.caffeine:caffeine:2.6.2") optional("net.sf.ehcache:ehcache:2.10.4") optional("org.quartz-scheduler:quartz:2.3.0") optional("org.codehaus.fabric3.api:commonj:1.1.0") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 0b1014cd0b6..c201bb51066 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -42,7 +42,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("io.undertow:undertow-core:${undertowVersion}") - optional("com.squareup.okhttp3:okhttp:3.9.1") + optional("com.squareup.okhttp3:okhttp:3.10.0") optional("org.apache.httpcomponents:httpclient:4.5.5") { exclude group: "commons-logging", module: "commons-logging" } @@ -78,7 +78,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.9.1") + testCompile("com.squareup.okhttp3:mockwebserver:3.10.0") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testRuntime("com.sun.mail:javax.mail:1.6.1") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 74ed928f1cd..c2101190bb8 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -54,7 +54,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") testCompile("io.undertow:undertow-core:${undertowVersion}") testCompile("com.fasterxml:aalto-xml:1.0.0") - testCompile("com.squareup.okhttp3:mockwebserver:3.9.1") + testCompile("com.squareup.okhttp3:mockwebserver:3.10.0") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")