From 088a653318a2bcbc5eb85aabb5189438ef496c2a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 7 Nov 2019 22:35:30 +0100 Subject: [PATCH] Upgrade to RxJava 2.2.14, OkHttp 3.14.4, Awaitility 3.1.6 --- build.gradle | 2 +- spring-context/spring-context.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 ce556824ab..7b125b06de 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ ext { reactorVersion = "Californium-SR13" rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" - rxjava2Version = "2.2.13" + rxjava2Version = "2.2.14" slf4jVersion = "1.7.28" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" tomcatVersion = "9.0.27" diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index 86d3f29a71..c9ae1662c3 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -28,7 +28,7 @@ dependencies { testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}") testCompile("org.apache.commons:commons-pool2:2.6.0") testCompile("javax.inject:javax.inject-tck:1") - testCompile("org.awaitility:awaitility:3.1.3") + testCompile("org.awaitility:awaitility:3.1.6") testRuntime("javax.xml.bind:jaxb-api:2.3.1") testRuntime("org.glassfish:javax.el:3.0.1-b08") testRuntime("org.javamoney:moneta:1.3") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 9e7a5c120a..390f697127 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.3") - optional("com.squareup.okhttp3:okhttp:3.14.3") + optional("com.squareup.okhttp3:okhttp:3.14.4") optional("org.apache.httpcomponents:httpclient:4.5.10") { 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.14.3") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.4") 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 acaf6c4d3a..88483ef351 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.3") - testCompile("com.squareup.okhttp3:mockwebserver:3.14.3") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.4") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")