From c3fa90067244e86db794c01298e6ff4add4263b3 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 22 Feb 2019 14:18:08 +0100 Subject: [PATCH 1/2] Upgrade to Hibernate Validator 5.4.3 and 6.0.15 --- spring-context-support/spring-context-support.gradle | 2 +- spring-context/spring-context.gradle | 2 +- spring-test/spring-test.gradle | 2 +- spring-webflux/spring-webflux.gradle | 2 +- spring-webmvc/spring-webmvc.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index ec5aad0d8d8..b21eee7e055 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.14.Final") + testCompile("org.hibernate:hibernate-validator:6.0.15.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-context/spring-context.gradle b/spring-context/spring-context.gradle index 38a71e02d1c..12ac18d1d3e 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -20,7 +20,7 @@ dependencies { optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.beanshell:bsh:2.0b5") optional("joda-time:joda-time:2.10.1") - optional("org.hibernate:hibernate-validator:5.4.2.Final") + optional("org.hibernate:hibernate-validator:5.4.3.Final") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}") diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 5d7ae715f15..79c4821e0ab 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.3.7.Final") - testCompile("org.hibernate:hibernate-validator:6.0.14.Final") + testCompile("org.hibernate:hibernate-validator:6.0.15.Final") // Enable use of the JUnit Platform Runner testCompile("org.junit.platform:junit-platform-runner") testCompile("org.junit.jupiter:junit-jupiter-params") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index cf51de3776b..5df33a8b247 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -42,7 +42,7 @@ dependencies { optional("com.google.protobuf:protobuf-java-util:3.6.1") testCompile("javax.xml.bind:jaxb-api:2.3.1") testCompile("com.fasterxml:aalto-xml:1.1.1") - testCompile("org.hibernate:hibernate-validator:6.0.14.Final") + testCompile("org.hibernate:hibernate-validator:6.0.15.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 ea1e01c9aae..21290919f93 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -66,7 +66,7 @@ dependencies { exclude group: "xerces", module: "xercesImpl" } testCompile("org.xmlunit:xmlunit-matchers:2.6.2") - testCompile("org.hibernate:hibernate-validator:6.0.14.Final") + testCompile("org.hibernate:hibernate-validator:6.0.15.Final") testCompile("io.projectreactor:reactor-core") testCompile("io.reactivex:rxjava:${rxjavaVersion}") testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") From 707b8c02fed6ffa87fb428952766b0324e4d14e9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 22 Feb 2019 14:18:39 +0100 Subject: [PATCH 2/2] Upgrade to Jetty 9.4.15 and Undertow 2.0.18 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0d76a577d34..c3c6a39ce90 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ ext { groovyVersion = "2.5.6" hsqldbVersion = "2.4.1" jackson2Version = "2.9.8" - jettyVersion = "9.4.14.v20181114" + jettyVersion = "9.4.15.v20190215" junit5Version = "5.3.2" kotlinVersion = "1.2.71" log4jVersion = "2.11.2" @@ -45,7 +45,7 @@ ext { slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" tomcatVersion = "9.0.16" - undertowVersion = "2.0.17.Final" + undertowVersion = "2.0.18.Final" gradleScriptDir = "${rootProject.projectDir}/gradle" withoutJclOverSlf4J = {