From af1691cbba8ed1d80a6ebf455b0d6a530db184b7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 22 Feb 2019 14:42:38 +0100 Subject: [PATCH] Upgrade to Hibernate Validator 5.4.3 and 6.0.15 Includes Apache HttpClient 4.5.7 and Jetty 9.4.15. --- build.gradle | 2 +- spring-context-support/spring-context-support.gradle | 2 +- spring-context/spring-context.gradle | 2 +- spring-test/spring-test.gradle | 4 ++-- spring-web/spring-web.gradle | 2 +- spring-webflux/spring-webflux.gradle | 4 ++-- spring-webmvc/spring-webmvc.gradle | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 303e2f091c..e1387085cf 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ ext { groovyVersion = "2.4.16" hsqldbVersion = "2.4.1" jackson2Version = "2.9.8" - jettyVersion = "9.4.14.v20181114" + jettyVersion = "9.4.15.v20190215" junitJupiterVersion = "5.0.3" junitPlatformVersion = "1.0.3" junitVintageVersion = "4.12.3" diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 89243c0fc0..afbdf149a9 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 fd28937a98..c99679e4e5 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -20,7 +20,7 @@ dependencies { optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.beanshell:bsh:2.0b5") optional("joda-time:joda-time:2.9.9") - 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.apache.commons:commons-pool2:2.5.0") diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 840fb2b564..d42cb62a87 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.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:${junitPlatformVersion}") testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}") @@ -71,7 +71,7 @@ dependencies { 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.6") { + testCompile("org.apache.httpcomponents:httpclient:4.5.7") { exclude group: "commons-logging", module: "commons-logging" } testCompile("io.projectreactor.ipc:reactor-netty") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 984edbb94b..3bbda32dad 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -37,7 +37,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("com.squareup.okhttp3:okhttp:3.12.1") - optional("org.apache.httpcomponents:httpclient:4.5.6") { + optional("org.apache.httpcomponents:httpclient:4.5.7") { exclude group: "commons-logging", module: "commons-logging" } optional("org.apache.httpcomponents:httpasyncclient:4.1.4") { diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index c7b1bdc16c..b6a3562513 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -33,14 +33,14 @@ 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:4.5.6") { + optional("org.apache.httpcomponents:httpclient:4.5.7") { 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:2.3.0") testCompile("com.fasterxml:aalto-xml:1.0.0") - 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 404702f82d..4cb8298f46 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -49,7 +49,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet" } - testCompile("org.apache.httpcomponents:httpclient:4.5.6") { + testCompile("org.apache.httpcomponents:httpclient:4.5.7") { exclude group: "commons-logging", module: "commons-logging" } testCompile("commons-fileupload:commons-fileupload:1.3.3") @@ -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.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}")