From 165d2511b9853087b08b0bedd68af46ac4ecbce1 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Tue, 5 Feb 2019 00:46:07 +0100
Subject: [PATCH] Upgrade to Apache HttpClient 4.5.7 and Commons FileUpload 1.4

Includes RxJava 2.2.6, Netty 4.1.33, Undertow 2.0.17.
---
 build.gradle                         | 6 +++---
 spring-test/spring-test.gradle       | 2 +-
 spring-web/spring-web.gradle         | 4 ++--
 spring-webflux/spring-webflux.gradle | 2 +-
 spring-webmvc/spring-webmvc.gradle   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1a1d91a92f..dd5ed3931a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,15 +37,15 @@ ext {
 	junit5Version        = "5.3.2"
 	kotlinVersion        = "1.2.71"
 	log4jVersion         = "2.11.1"
-	nettyVersion         = "4.1.32.Final"
+	nettyVersion         = "4.1.33.Final"
 	reactorVersion       = "Californium-SR4"
 	rxjavaVersion        = "1.3.8"
 	rxjavaAdapterVersion = "1.2.1"
-	rxjava2Version       = "2.2.5"
+	rxjava2Version       = "2.2.6"
 	slf4jVersion         = "1.7.25"	  // spring-jcl + consistent 3rd party deps
 	tiles3Version        = "3.0.8"
 	tomcatVersion        = "9.0.14"
-	undertowVersion      = "2.0.16.Final"
+	undertowVersion      = "2.0.17.Final"
 
 	gradleScriptDir = "${rootProject.projectDir}/gradle"
 	withoutJclOverSlf4J = {
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 765b2d3c65..5d7ae715f1 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -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 560a0ad3f2..4e7b0a679e 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -39,13 +39,13 @@ 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") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
-	optional("commons-fileupload:commons-fileupload:1.3.3")
+	optional("commons-fileupload:commons-fileupload:1.4")
 	optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
 	optional("com.fasterxml.woodstox:woodstox-core:5.2.0") {  // woodstox before aalto
 		exclude group: "stax", module: "stax-api"
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 507c7e0bef..ea1e01c9aa 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -50,10 +50,10 @@ 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.3.3")
+	testCompile("commons-fileupload:commons-fileupload:1.4")
 	testCompile("commons-io:commons-io:2.5")
 	testCompile("joda-time:joda-time:2.10.1")
 	testCompile("org.mozilla:rhino:1.7.10")