From c700ccbc0027c9cf840e8b8379eb05125a408fe1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 5 Feb 2019 00:10:40 +0100 Subject: [PATCH] Upgrade to Apache HttpClient 4.5.7 Includes Hibernate ORM 5.4.1 for integration tests. --- spring-test/spring-test.gradle | 4 ++-- spring-web/spring-web.gradle | 2 +- spring-webflux/spring-webflux.gradle | 2 +- spring-webmvc/spring-webmvc.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 765b2d3c65..c70ea34c12 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -60,7 +60,7 @@ dependencies { testCompile("javax.ejb:javax.ejb-api:3.2") 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-core:5.4.1.Final") testCompile("org.hibernate:hibernate-validator:6.0.14.Final") // Enable use of the JUnit Platform Runner testCompile("org.junit.platform:junit-platform-runner") @@ -72,7 +72,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.netty:reactor-netty") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index aed2125eac..4e7b0a679e 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -39,7 +39,7 @@ dependencies { } optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.2") 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 126470eed4..cf51de3776 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -34,7 +34,7 @@ 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}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 929472da70..ea1e01c9aa 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -50,7 +50,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") { 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.4")