Skip to content

Commit 8d42888

Browse files
committed
Upgrade to RxJava 1.3.5 and WebJars Locator 0.35
Includes Rhino 1.7.8 and JRuby 9.1.15 as well.
1 parent 7772b91 commit 8d42888

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ configure(allprojects) { project ->
5454
ext.log4jVersion = "2.10.0"
5555
ext.nettyVersion = "4.1.20.Final"
5656
ext.reactorVersion = "Bismuth-SR5"
57-
ext.rxjavaVersion = "1.3.4"
57+
ext.rxjavaVersion = "1.3.5"
5858
ext.rxjavaAdapterVersion = "1.2.1"
5959
ext.rxjava2Version = "2.1.9"
6060
ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps

spring-webmvc/spring-webmvc.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
2727
optional("javax.el:javax.el-api:3.0.1-b04")
2828
optional("javax.xml.bind:jaxb-api:2.3.0")
29-
optional('org.webjars:webjars-locator:0.32-1')
29+
optional('org.webjars:webjars-locator-core:0.35')
3030
optional("com.rometools:rome:1.9.0")
3131
optional("com.github.librepdf:openpdf:1.0.5")
3232
optional("org.apache.poi:poi-ooxml:3.17")
@@ -61,7 +61,7 @@ dependencies {
6161
testCompile("commons-fileupload:commons-fileupload:1.3.3")
6262
testCompile("commons-io:commons-io:2.5")
6363
testCompile("joda-time:joda-time:2.9.9")
64-
testCompile("org.mozilla:rhino:1.7.7.2")
64+
testCompile("org.mozilla:rhino:1.7.8")
6565
testCompile("dom4j:dom4j:1.6.1") {
6666
exclude group: "xml-apis", module: "xml-apis"
6767
}
@@ -77,7 +77,7 @@ dependencies {
7777
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
7878
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
7979
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
80-
testRuntime("org.jruby:jruby:9.1.14.0")
80+
testRuntime("org.jruby:jruby:9.1.15.0")
8181
testRuntime("org.python:jython-standalone:2.7.1")
8282
testRuntime("org.webjars:underscorejs:1.8.3")
8383
testRuntime("org.glassfish:javax.el:3.0.1-b08")

0 commit comments

Comments
 (0)