From 8d42888476e892dfa1b099684c9a381bbd26f916 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 29 Jan 2018 21:31:27 +0100 Subject: [PATCH] Upgrade to RxJava 1.3.5 and WebJars Locator 0.35 Includes Rhino 1.7.8 and JRuby 9.1.15 as well. --- build.gradle | 2 +- spring-webmvc/spring-webmvc.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 020a988f01d..f77fbdcf9e7 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ configure(allprojects) { project -> ext.log4jVersion = "2.10.0" ext.nettyVersion = "4.1.20.Final" ext.reactorVersion = "Bismuth-SR5" - ext.rxjavaVersion = "1.3.4" + ext.rxjavaVersion = "1.3.5" ext.rxjavaAdapterVersion = "1.2.1" ext.rxjava2Version = "2.1.9" ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index e5e02184c8a..736f0926c17 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -26,7 +26,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.0") - optional('org.webjars:webjars-locator:0.32-1') + optional('org.webjars:webjars-locator-core:0.35') optional("com.rometools:rome:1.9.0") optional("com.github.librepdf:openpdf:1.0.5") optional("org.apache.poi:poi-ooxml:3.17") @@ -61,7 +61,7 @@ dependencies { testCompile("commons-fileupload:commons-fileupload:1.3.3") testCompile("commons-io:commons-io:2.5") testCompile("joda-time:joda-time:2.9.9") - testCompile("org.mozilla:rhino:1.7.7.2") + testCompile("org.mozilla:rhino:1.7.8") testCompile("dom4j:dom4j:1.6.1") { exclude group: "xml-apis", module: "xml-apis" } @@ -77,7 +77,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.1.14.0") + testRuntime("org.jruby:jruby:9.1.15.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")