Upgrade to Apache HttpClient 4.5.9 and Tomcat 8.5.42

jhoeller · jhoeller · commit 53b53e21be0e · 2019-06-12T00:51:26.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ ext {
 	rxjava2Version       = "2.1.17"
 	slf4jVersion         = "1.7.26"	  // spring-jcl + consistent 3rd party deps
 	tiles3Version        = "3.0.8"
-	tomcatVersion        = "8.5.40"
+	tomcatVersion        = "8.5.42"
 	undertowVersion      = "1.4.27.Final"
 
 	gradleScriptDir = "${rootProject.projectDir}/gradle"
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
@@ -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.8") {
+	testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
 		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
@@ -37,7 +37,7 @@ dependencies {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
 	optional("com.squareup.okhttp3:okhttp:3.12.3")
-	optional("org.apache.httpcomponents:httpclient:4.5.8") {
+	optional("org.apache.httpcomponents:httpclient:4.5.9") {
 		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
@@ -33,7 +33,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.8") {
+	optional("org.apache.httpcomponents:httpclient:4.5.9") {
 		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
@@ -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.8") {
+	testCompile("org.apache.httpcomponents:httpclient:4.5.9") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	testCompile("commons-fileupload:commons-fileupload:1.3.3")

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ dependencies {`
`71`	`71`	`testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)`
`72`	`72`	`testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)`
`73`	`73`	`testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")`
`74`		`- testCompile("org.apache.httpcomponents:httpclient:4.5.8") {`
	`74`	`+ testCompile("org.apache.httpcomponents:httpclient:4.5.9") {`
`75`	`75`	`exclude group: "commons-logging", module: "commons-logging"`
`76`	`76`	`}`
`77`	`77`	`testCompile("io.projectreactor.ipc:reactor-netty")`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ dependencies {`
`37`	`37`	`exclude group: "javax.servlet", module: "javax.servlet-api"`
`38`	`38`	`}`
`39`	`39`	`optional("com.squareup.okhttp3:okhttp:3.12.3")`
`40`		`- optional("org.apache.httpcomponents:httpclient:4.5.8") {`
	`40`	`+ optional("org.apache.httpcomponents:httpclient:4.5.9") {`
`41`	`41`	`exclude group: "commons-logging", module: "commons-logging"`
`42`	`42`	`}`
`43`	`43`	`optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ dependencies {`
`33`	`33`	`optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {`
`34`	`34`	`exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"`
`35`	`35`	`}`
`36`		`- optional("org.apache.httpcomponents:httpclient:4.5.8") {`
	`36`	`+ optional("org.apache.httpcomponents:httpclient:4.5.9") {`
`37`	`37`	`exclude group: "commons-logging", module: "commons-logging"`
`38`	`38`	`}`
`39`	`39`	`optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ dependencies {`
`49`	`49`	`testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {`
`50`	`50`	`exclude group: "javax.servlet", module: "javax.servlet"`
`51`	`51`	`}`
`52`		`- testCompile("org.apache.httpcomponents:httpclient:4.5.8") {`
	`52`	`+ testCompile("org.apache.httpcomponents:httpclient:4.5.9") {`
`53`	`53`	`exclude group: "commons-logging", module: "commons-logging"`
`54`	`54`	`}`
`55`	`55`	`testCompile("commons-fileupload:commons-fileupload:1.3.3")`