From c4cdb98d8dcc6464b203d7255380b370e022e447 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 20 Jul 2019 17:34:25 +0200 Subject: [PATCH] Upgrade to Tomcat 8.5.43, Jetty 9.4.19, Netty 4.1.37 Includes Hibernate Validator 6.0.17 and renames "withoutJclOverSlf4j". --- build.gradle | 8 ++++---- spring-context-support/spring-context-support.gradle | 2 +- spring-test/spring-test.gradle | 6 +++--- spring-webflux/spring-webflux.gradle | 2 +- spring-webmvc/spring-webmvc.gradle | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 4e5c3eb2dc..0de1397435 100644 --- a/build.gradle +++ b/build.gradle @@ -41,24 +41,24 @@ ext { groovyVersion = "2.4.17" hsqldbVersion = "2.4.1" jackson2Version = "2.9.9" - jettyVersion = "9.4.18.v20190429" + jettyVersion = "9.4.19.v20190610" junitJupiterVersion = "5.0.3" junitPlatformVersion = "1.0.3" junitVintageVersion = "4.12.3" kotlinVersion = "1.2.71" log4jVersion = "2.11.2" - nettyVersion = "4.1.36.Final" + nettyVersion = "4.1.37.Final" reactorVersion = "Bismuth-SR17" rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" rxjava2Version = "2.1.17" slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" - tomcatVersion = "8.5.42" + tomcatVersion = "8.5.43" undertowVersion = "1.4.27.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 0ed964036f..364d2274e2 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 76c6d57e0d..3848d16399 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -60,7 +60,7 @@ dependencies { testCompile("javax.interceptor:javax.interceptor-api:1.2.1") testCompile("javax.mail:javax.mail-api:1.6.1") testCompile("org.hibernate:hibernate-core:5.2.18.Final") - testCompile("org.hibernate:hibernate-validator:6.0.16.Final") + testCompile("org.hibernate:hibernate-validator:6.0.17.Final") // Enable use of the JUnit Platform Runner testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}") testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}") @@ -68,8 +68,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 8abaa18f11..f160c20726 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -40,7 +40,7 @@ dependencies { optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") testCompile("javax.xml.bind:jaxb-api:2.3.0") testCompile("com.fasterxml:aalto-xml:1.0.0") - 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 9c348b726e..408948b707 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -29,11 +29,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" @@ -65,7 +65,7 @@ dependencies { exclude group: "xerces", module: "xercesImpl" } testCompile("org.xmlunit:xmlunit-matchers:2.5.1") - 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}")