Latest dependency updates (POI 3.17, Rome 1.8, EhCache 3.4, Caffeine …

…2.5.6, RxJava 2.1.4, Tomcat 8.5.21, JRuby 9.1.13, Rhino 1.7.7.2)

build.gradle

@@ -63,10 +63,10 @@ configure(allprojects) { project ->
 	ext.reactorVersion       = "Bismuth-RC1"
 	ext.rxjavaVersion        = '1.3.2'
 	ext.rxjavaAdapterVersion = '1.2.1'
-	ext.rxjava2Version       = '2.1.3'
+	ext.rxjava2Version       = '2.1.4'
 	ext.slf4jVersion         = "1.7.25"
 	ext.tiles3Version        = "3.0.7"
-	ext.tomcatVersion        = "8.5.20"
+	ext.tomcatVersion        = "8.5.21"
 	ext.undertowVersion      = "1.4.20.Final"
 
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"

buildSrc/spring-build-src.gradle

@@ -7,4 +7,4 @@ dependencies {
 	compile localGroovy()
 }
 
-configurations.archives.artifacts.clear()
+configurations.archives.artifacts.clear()

gradle/docs.gradle

@@ -227,4 +227,4 @@ task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
 			}
 		}
 	}
-}
+}

settings.gradle

@@ -39,4 +39,4 @@ rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"
 rootProject.name = 'spring'
 rootProject.children.each {project ->
 	project.buildFileName = "${project.name}.gradle"
-}
+}

spring-aop/spring-aop.gradle

@@ -6,4 +6,4 @@ dependencies {
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	optional("org.apache.commons:commons-pool2:2.4.2")
 	optional("com.jamonapi:jamon:2.81")
-}
+}

spring-aspects/spring-aspects.gradle

@@ -106,4 +106,4 @@ dependencies {
 eclipse.project {
 	natures += "org.eclipse.ajdt.ui.ajnature"
 	buildCommands = [new org.gradle.plugins.ide.eclipse.model.BuildCommand("org.eclipse.ajdt.core.ajbuilder")]
-}
+}

spring-beans/spring-beans.gradle

@@ -30,4 +30,3 @@ compileGroovy {
 compileGroovy.dependsOn = compileGroovy.taskDependencies.values - 'compileJava'
 compileKotlin.dependsOn(compileGroovy)
 compileKotlin.classpath += files(compileGroovy.destinationDir)
-

spring-context-indexer/spring-context-indexer.gradle

@@ -5,4 +5,4 @@ dependencies {
 	testCompile("javax.inject:javax.inject:1")
 	testCompile("javax.annotation:javax.annotation-api:1.3")
 	testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
-}
+}

spring-context-support/spring-context-support.gradle

@@ -9,7 +9,7 @@ dependencies {
 	optional("javax.activation:activation:${activationVersion}")
 	optional("javax.mail:javax.mail-api:${javamailVersion}")
 	optional("javax.cache:cache-api:1.0.0")
-	optional("com.github.ben-manes.caffeine:caffeine:2.5.5")
+	optional("com.github.ben-manes.caffeine:caffeine:2.5.6")
 	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")
@@ -19,8 +19,8 @@ dependencies {
 	testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
 	testRuntime("org.ehcache:jcache:1.0.1")
-	testRuntime("org.ehcache:ehcache:3.3.1")
+	testRuntime("org.ehcache:ehcache:3.4.0")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
 	testRuntime("javax.annotation:javax.annotation-api:1.3")
 	testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
-}
+}

spring-context/spring-context.gradle

@@ -29,4 +29,4 @@ dependencies {
 	testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
 	testRuntime("org.javamoney:moneta:1.1")
-}
+}

spring-core/spring-core.gradle

@@ -76,7 +76,7 @@ dependencies {
 	compile(files(cglibRepackJar))
 	compile(files(objenesisRepackJar))
 	compile(project(":spring-jcl"))
-	optional("net.sf.jopt-simple:jopt-simple:5.0.3")
+	optional("net.sf.jopt-simple:jopt-simple:5.0.4")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")

spring-expression/spring-expression.gradle

@@ -2,4 +2,4 @@ description = "Spring Expression Language (SpEL)"
 
 dependencies {
 	compile(project(":spring-core"))
-}
+}

spring-framework-bom/spring-framework-bom.gradle

@@ -35,4 +35,4 @@ install {
 			}
 		}
 	}
-}
+}

spring-instrument/spring-instrument.gradle

@@ -8,4 +8,4 @@ jar {
 	manifest.attributes["Can-Redefine-Classes"] = "true"
 	manifest.attributes["Can-Retransform-Classes"] = "true"
 	manifest.attributes["Can-Set-Native-Method-Prefix"] = "false"
-}
+}

spring-jcl/spring-jcl.gradle

@@ -3,4 +3,4 @@ description = "Spring Commons Logging Bridge"
 dependencies {
 	optional("org.apache.logging.log4j:log4j-api:${log4jVersion}")
 	optional("org.slf4j:slf4j-api:${slf4jVersion}")
-}
+}

spring-jdbc/spring-jdbc.gradle

@@ -12,4 +12,4 @@ dependencies {
 	optional("org.apache.derby:derbyclient:10.13.1.1")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-}
+}

spring-jms/spring-jms.gradle

@@ -12,4 +12,4 @@ dependencies {
 	optional("javax.resource:javax.resource-api:1.7")
 	optional("javax.transaction:javax.transaction-api:1.2")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
-}
+}

spring-messaging/spring-messaging.gradle

@@ -44,4 +44,4 @@ dependencies {
 	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
 	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 	testRuntime("javax.activation:activation:${activationVersion}")
-}
+}

spring-orm/spring-orm.gradle

@@ -14,4 +14,4 @@ dependencies {
 	testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 	testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}")
-}
+}

spring-oxm/spring-oxm.gradle

@@ -141,4 +141,4 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
 			}
 		}
 	}
-}
+}

spring-test/spring-test.gradle

@@ -71,7 +71,7 @@ dependencies {
 	testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
 	testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	testCompile("com.thoughtworks.xstream:xstream:1.4.10")
-	testCompile("com.rometools:rome:1.7.4")
+	testCompile("com.rometools:rome:1.8.0")
 	testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
 	testCompile("org.apache.tiles:tiles-core:${tiles3Version}") {
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"
@@ -126,4 +126,4 @@ task aggregateTestReports(type: TestReport) {
 	reportOn test, testNG
 }
 
-check.dependsOn aggregateTestReports
+check.dependsOn aggregateTestReports

spring-tx/spring-tx.gradle

@@ -13,4 +13,4 @@ dependencies {
 	testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
-}
+}

spring-web/spring-web.gradle

@@ -24,47 +24,47 @@ dependencies {
 	optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
 	optional("javax.el:javax.el-api:3.0.1-b04")
 	optional("javax.faces:javax.faces-api:2.2")
+	optional("javax.json.bind:javax.json.bind-api:1.0")
+	optional("javax.mail:javax.mail-api:${javamailVersion}")
 	optional("javax.validation:validation-api:1.1.0.Final")
-	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
-	optional("com.caucho:hessian:4.0.51")
-	optional("commons-fileupload:commons-fileupload:1.3.3")
-	optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
-	optional("io.projectreactor.ipc:reactor-netty")
+	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
 	optional("io.reactivex:rxjava:${rxjavaVersion}")
 	optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
 	optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
+	optional("io.netty:netty-all")
+	optional("io.projectreactor.ipc:reactor-netty")
 	optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
-	optional("io.undertow:undertow-core:${undertowVersion}")
-	optional("com.fasterxml.woodstox:woodstox-core:5.0.3") {  // woodstox before aalto
-		exclude group: "stax", module: "stax-api"
+	optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
+		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
-	optional("com.fasterxml:aalto-xml:1.0.0")
+	optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
+		exclude group: "javax.servlet", module: "javax.servlet-api"
+	}
+	optional("io.undertow:undertow-core:${undertowVersion}")
+	optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
 	optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
-	optional("io.netty:netty-all")
-	optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
+	optional("commons-fileupload:commons-fileupload:1.3.3")
+	optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
+	optional("com.fasterxml.woodstox:woodstox-core:5.0.3") {  // woodstox before aalto
+		exclude group: "stax", module: "stax-api"
+	}
+	optional("com.fasterxml:aalto-xml:1.0.0")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
-	optional("com.google.code.gson:gson:2.8.1")
-	optional("javax.json.bind:javax.json.bind-api:1.0")
-	optional("com.rometools:rome:1.7.4")
-	optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
-		exclude group: "javax.servlet", module: "javax.servlet-api"
-	}
-	optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
-		exclude group: "javax.servlet", module: "javax.servlet-api"
-	}
+	optional("com.google.code.gson:gson:2.8.2")
 	optional("com.google.protobuf:protobuf-java-util:3.4.0")
 	optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
-	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
-	optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
-	optional("javax.mail:javax.mail-api:${javamailVersion}")
+	optional("com.rometools:rome:1.8.0")
+	optional("com.caucho:hessian:4.0.51")
+	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	testCompile("io.projectreactor:reactor-test")
@@ -89,4 +89,4 @@ dependencies {
 	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 	testRuntime("javax.json:javax.json-api:1.1")
 	testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.3")
-}
+}

spring-webflux/spring-webflux.gradle

@@ -22,16 +22,13 @@ dependencies {
 	optional(project(":spring-context-support"))  // for FreeMarker support
 	optional("javax.servlet:javax.servlet-api:3.1.0")
 	optional("javax.websocket:javax.websocket-api:1.1")
+	optional("org.webjars:webjars-locator:0.32-1")
+	optional("org.freemarker:freemarker:${freemarkerVersion}")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
-	optional("org.freemarker:freemarker:${freemarkerVersion}")
-	optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
-	optional('org.webjars:webjars-locator:0.32-1')
-	optional("io.projectreactor.ipc:reactor-netty")
 	optional("io.reactivex:rxjava:${rxjavaVersion}")
 	optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
+	optional("io.projectreactor.ipc:reactor-netty")
 	optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") {
 		exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
 		exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
@@ -42,31 +39,34 @@ dependencies {
 	optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
 		exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
 	}
+	optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
-	testCompile("io.projectreactor:reactor-test")
 	testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
+	testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
+	testCompile("io.projectreactor:reactor-test")
+	testCompile("io.reactivex:rxnetty-http:0.5.2") {
+		exclude group: 'io.reactivex', module: 'rxjava'
+	}
 	testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
 	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
-	testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
 	testCompile("io.undertow:undertow-core:${undertowVersion}")
-	testCompile("io.reactivex:rxnetty-http:0.5.2") {
-		exclude group: 'io.reactivex', module: 'rxjava'
-	}
 	testCompile("com.fasterxml:aalto-xml:1.0.0")
 	testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
 	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.12.0")
+	testRuntime("org.jruby:jruby:9.1.13.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")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
 	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
 	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 	testRuntime("javax.activation:activation:${activationVersion}")
-}
+}

spring-webmvc/spring-webmvc.gradle

@@ -26,11 +26,11 @@ 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:${jaxbVersion}")
-	optional("org.apache.poi:poi-ooxml:3.16")
+	optional('org.webjars:webjars-locator:0.32-1')
+	optional("com.rometools:rome:1.8.0")
 	optional("com.lowagie:itext:2.1.7")
-	optional("com.rometools:rome:1.7.4")
+	optional("org.apache.poi:poi-ooxml:3.17")
 	optional("org.freemarker:freemarker:${freemarkerVersion}")
-	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
@@ -52,7 +52,7 @@ dependencies {
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		exclude group: "org.springframework", module: "spring-web"
 	}
-	optional('org.webjars:webjars-locator:0.32-1')
+	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	optional("org.reactivestreams:reactive-streams")
@@ -70,7 +70,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.1")
+	testCompile("org.mozilla:rhino:1.7.7.2")
 	testCompile("dom4j:dom4j:1.6.1") {
 		exclude group: "xml-apis", module: "xml-apis"
 	}
@@ -86,11 +86,11 @@ 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.12.0")
+	testRuntime("org.jruby:jruby:9.1.13.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")
 	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
 	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
 	testRuntime("javax.activation:activation:${activationVersion}")
-}
+}

spring-websocket/spring-websocket.gradle

@@ -45,4 +45,4 @@ dependencies {
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
 	testCompile("io.projectreactor.ipc:reactor-netty")
-}
+}