From 867b3d233d950edf9d22da642c8b363994294468 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 19 Jul 2018 17:52:08 +0200 Subject: [PATCH] Upgrade to OkHttp 3.11, Apache HttpClient 4.5.6, Hibernate Validator 6.0.11 --- spring-context-support/spring-context-support.gradle | 2 +- spring-test/spring-test.gradle | 4 ++-- spring-web/spring-web.gradle | 6 +++--- spring-webflux/spring-webflux.gradle | 6 +++--- spring-webmvc/spring-webmvc.gradle | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 13da23235d..80bd2c98aa 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.10.Final") + testCompile("org.hibernate:hibernate-validator:6.0.11.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 18fbf58b09..95d9248154 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.17.Final") - testCompile("org.hibernate:hibernate-validator:6.0.10.Final") + testCompile("org.hibernate:hibernate-validator:6.0.11.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.5") { + testCompile("org.apache.httpcomponents:httpclient:4.5.6") { exclude group: "commons-logging", module: "commons-logging" } testCompile('io.projectreactor.netty:reactor-netty') diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index fddab6b6ee..a66b078996 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -37,8 +37,8 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("io.undertow:undertow-core:${undertowVersion}") - optional("com.squareup.okhttp3:okhttp:3.10.0") - optional("org.apache.httpcomponents:httpclient:4.5.5") { + optional("com.squareup.okhttp3:okhttp:3.11.0") + optional("org.apache.httpcomponents:httpclient:4.5.6") { exclude group: "commons-logging", module: "commons-logging" } optional("org.apache.httpcomponents:httpasyncclient:4.1.3") { @@ -74,7 +74,7 @@ dependencies { testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") - testCompile("com.squareup.okhttp3:mockwebserver:3.10.0") + testCompile("com.squareup.okhttp3:mockwebserver:3.11.0") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.0") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index b51475dcd4..091f98bba7 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -34,13 +34,13 @@ 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.5") { + optional("org.apache.httpcomponents:httpclient:4.5.6") { 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("org.hibernate:hibernate-validator:6.0.10.Final") + testCompile("org.hibernate:hibernate-validator:6.0.11.Final") testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" testCompile("io.projectreactor:reactor-test") testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") @@ -50,7 +50,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-servlet") testCompile("io.undertow:undertow-core:${undertowVersion}") testCompile("com.fasterxml:aalto-xml:1.1.0") - testCompile("com.squareup.okhttp3:mockwebserver:3.10.0") + testCompile("com.squareup.okhttp3:mockwebserver:3.11.0") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 745c6ba10b..cf6c5b6855 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -50,8 +50,8 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") { exclude group: "javax.servlet", module: "javax.servlet" } - testCompile("org.hibernate:hibernate-validator:6.0.10.Final") - testCompile("org.apache.httpcomponents:httpclient:4.5.5") { + testCompile("org.hibernate:hibernate-validator:6.0.11.Final") + testCompile("org.apache.httpcomponents:httpclient:4.5.6") { exclude group: "commons-logging", module: "commons-logging" } testCompile("commons-fileupload:commons-fileupload:1.3.3")