From 91e6274b7d0fd13ce94e793f514841f12478f67f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 22 Jan 2018 22:11:00 +0100 Subject: [PATCH] Upgrade to Apache HttpClient 4.5.5 and Tomcat 8.5.27 --- build.gradle | 2 +- spring-test/spring-test.gradle | 2 +- spring-web/spring-web.gradle | 2 +- spring-webflux/spring-webflux.gradle | 2 +- spring-webmvc/spring-webmvc.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0d02d847b5e..8c9fb5a510c 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ configure(allprojects) { project -> ext.rxjava2Version = "2.1.8" ext.slf4jVersion = "1.7.25" ext.tiles3Version = "3.0.8" - ext.tomcatVersion = "8.5.24" + ext.tomcatVersion = "8.5.27" ext.undertowVersion = "1.4.22.Final" ext.gradleScriptDir = "${rootProject.projectDir}/gradle" diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 1a9d075b7de..3eab98c3361 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -81,7 +81,7 @@ dependencies { exclude group: "org.slf4j", module: "jcl-over-slf4j" } testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") - testCompile("org.apache.httpcomponents:httpclient:4.5.3") { + testCompile("org.apache.httpcomponents:httpclient:4.5.5") { 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 a6e8ea71a67..5786d766832 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -43,7 +43,7 @@ dependencies { } optional("io.undertow:undertow-core:${undertowVersion}") optional("com.squareup.okhttp3:okhttp:3.9.1") - optional("org.apache.httpcomponents:httpclient:4.5.4") { + optional("org.apache.httpcomponents:httpclient:4.5.5") { exclude group: "commons-logging", module: "commons-logging" } optional("org.apache.httpcomponents:httpasyncclient:4.1.3") { diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 91835a93276..ba0dd732d16 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -39,7 +39,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.3") { + optional("org.apache.httpcomponents:httpclient:4.5.5") { 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 7e2c0430a42..0ae253bde04 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -64,7 +64,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet" } testCompile("org.hibernate:hibernate-validator:6.0.7.Final") - testCompile("org.apache.httpcomponents:httpclient:4.5.3") { + testCompile("org.apache.httpcomponents:httpclient:4.5.5") { exclude group: "commons-logging", module: "commons-logging" } testCompile("commons-fileupload:commons-fileupload:1.3.3")