diff --git a/build.gradle b/build.gradle index a81a290db7..cd116a4823 100644 --- a/build.gradle +++ b/build.gradle @@ -28,13 +28,13 @@ ext { (it.name != "spring-build-src") && (it.name != "spring-framework-bom") && (it.name != "spring-core-coroutines") } - aspectjVersion = "1.9.3" + aspectjVersion = "1.9.4" coroutinesVersion = "1.2.1" freemarkerVersion = "2.3.28" groovyVersion = "2.5.7" hsqldbVersion = "2.4.1" jackson2Version = "2.9.9" - jettyVersion = "9.4.18.v20190429" + jettyVersion = "9.4.19.v20190610" junit5Version = "5.5.0-RC2" kotlinVersion = "1.3.40" log4jVersion = "2.11.2" @@ -43,14 +43,14 @@ ext { rsocketVersion = "0.12.2-RC4" rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" - rxjava2Version = "2.2.9" + rxjava2Version = "2.2.10" slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" tomcatVersion = "9.0.21" - undertowVersion = "2.0.21.Final" + undertowVersion = "2.0.22.Final" gradleScriptDir = "${rootProject.projectDir}/gradle" - withoutJclOverSlf4J = { + withoutJclOverSlf4j = { exclude group: "org.slf4j", module: "jcl-over-slf4j" } } diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 3e4cf92a1e..a0e8dd9530 100644 --- a/spring-context-support/spring-context-support.gradle +++ b/spring-context-support/spring-context-support.gradle @@ -16,7 +16,7 @@ dependencies { optional("org.freemarker:freemarker:${freemarkerVersion}") testCompile(project(":spring-context")) testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") - testCompile("org.hibernate:hibernate-validator:6.0.16.Final") + testCompile("org.hibernate:hibernate-validator:6.0.17.Final") testCompile("javax.annotation:javax.annotation-api:1.3.2") testRuntime("org.ehcache:jcache:1.0.1") testRuntime("org.ehcache:ehcache:3.4.0") diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index c6147106f4..f46320cf9e 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -61,7 +61,7 @@ dependencies { testCompile("javax.interceptor:javax.interceptor-api:1.2.2") testCompile("javax.mail:javax.mail-api:1.6.2") testCompile("org.hibernate:hibernate-core:5.4.3.Final") - testCompile("org.hibernate:hibernate-validator:6.0.16.Final") + testCompile("org.hibernate:hibernate-validator:6.0.17.Final") testCompile("org.junit.platform:junit-platform-runner") testCompile("org.junit.platform:junit-platform-testkit") testCompile("org.junit.jupiter:junit-jupiter-params") @@ -69,8 +69,8 @@ dependencies { testCompile("com.thoughtworks.xstream:xstream:1.4.10") testCompile("com.rometools:rome:1.12.0") testCompile("org.apache.tiles:tiles-api:${tiles3Version}") - testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J) - testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J) + testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j) + testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.apache.httpcomponents:httpclient:4.5.9") { exclude group: "commons-logging", module: "commons-logging" diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 25da0991cf..df349ce1b7 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -45,7 +45,7 @@ dependencies { optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}") testCompile("javax.xml.bind:jaxb-api:2.3.1") testCompile("com.fasterxml:aalto-xml:1.1.1") - testCompile("org.hibernate:hibernate-validator:6.0.16.Final") + testCompile("org.hibernate:hibernate-validator:6.0.17.Final") testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" testCompile("io.projectreactor:reactor-test") testCompile("io.undertow:undertow-core:${undertowVersion}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 0e9cf262f8..65645f9b38 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -30,11 +30,11 @@ dependencies { 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("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4J) - optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J) - optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J) - optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4J) - optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4J) + optional("org.apache.tiles:tiles-api:${tiles3Version}", withoutJclOverSlf4j) + optional("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j) + optional("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j) + optional("org.apache.tiles:tiles-jsp:${tiles3Version}", withoutJclOverSlf4j) + optional("org.apache.tiles:tiles-el:${tiles3Version}", withoutJclOverSlf4j) optional("org.apache.tiles:tiles-extras:${tiles3Version}") { exclude group: "org.springframework", module: "spring-web" exclude group: "org.slf4j", module: "jcl-over-slf4j" @@ -67,7 +67,7 @@ dependencies { } testCompile("org.xmlunit:xmlunit-assertj:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") - testCompile("org.hibernate:hibernate-validator:6.0.16.Final") + testCompile("org.hibernate:hibernate-validator:6.0.17.Final") testCompile("io.projectreactor:reactor-core") testCompile("io.reactivex:rxjava:${rxjavaVersion}") testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")