From 8d1de75b60b5d1a014aec6156e6c858106d196fe Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 25 Dec 2018 13:22:17 +0100 Subject: [PATCH] Upgrade to WebJars Locator 0.36 and OkHttp 3.12.1 Includes JRuby 9.2.5 and Jetty Reactive HttpClient 1.0.2. --- spring-web/spring-web.gradle | 4 ++-- spring-webflux/spring-webflux.gradle | 4 ++-- spring-webmvc/spring-webmvc.gradle | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index a444585f776..dde2ddf7257 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -37,8 +37,8 @@ dependencies { optional("org.eclipse.jetty:jetty-servlet") { exclude group: "javax.servlet", module: "javax.servlet-api" } - optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.1") - optional("com.squareup.okhttp3:okhttp:3.12.0") + optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") + optional("com.squareup.okhttp3:okhttp:3.12.1") optional("org.apache.httpcomponents:httpclient:4.5.6") { exclude group: "commons-logging", module: "commons-logging" } diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 23ae670a536..4fb11156624 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -50,12 +50,12 @@ dependencies { testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") - testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.1") + testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") testCompile("com.squareup.okhttp3:mockwebserver:3.12.0") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") - testRuntime("org.jruby:jruby:9.2.0.0") + testRuntime("org.jruby:jruby:9.2.5.0") testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0") testRuntime("org.webjars:underscorejs:1.8.3") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 849b902f58b..e0d9c77a593 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -21,7 +21,7 @@ dependencies { optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1") optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.xml.bind:jaxb-api:2.3.1") - optional("org.webjars:webjars-locator-core:0.35") + optional("org.webjars:webjars-locator-core:0.36") optional("com.rometools:rome:1.12.0") optional("com.github.librepdf:openpdf:1.2.7") optional("org.apache.poi:poi-ooxml:4.0.1") @@ -74,7 +74,7 @@ dependencies { testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") - testRuntime("org.jruby:jruby:9.2.0.0") + testRuntime("org.jruby:jruby:9.2.5.0") testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.webjars:underscorejs:1.8.3") testRuntime("org.glassfish:javax.el:3.0.1-b08")