Adapt build dependencies to httpclient5

bclozel · bclozel · commit 5fb2a50ad0eb · 2022-09-29T18:55:41.000+02:00
As htttpclient 4.x is not supported anymore by `RestTemplate`, this commit changes such dependencies to httpclient5 instead. In some cases, the httpclient 4.x was transitively brought by a non-Spring dependency. See gh-32461
diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle
@@ -31,9 +31,7 @@ dependencies {
 	intTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	intTestImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	intTestImplementation("org.apache.httpcomponents.client5:httpclient5")
 	intTestImplementation("org.assertj:assertj-core")
 	intTestImplementation("org.awaitility:awaitility")
 	intTestImplementation("org.junit.jupiter:junit-jupiter")
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -86,6 +86,7 @@ dependencies {
 		exclude group: "commons-logging", module: "commons-logging"
 		exclude group: "xml-apis", module: "xml-apis"
 	}
+	implementation("org.apache.httpcomponents.client5:httpclient5")
 	implementation("org.apache.commons:commons-dbcp2") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle
@@ -18,9 +18,7 @@ dependencies {
 	optional("jakarta.json.bind:jakarta.json.bind-api")
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("junit:junit")
-	optional("org.apache.httpcomponents:httpclient") {
-		exclude(group: "commons-logging", module: "commons-logging")
-	}
+	optional("org.apache.httpcomponents.client5:httpclient5")
 	optional("org.assertj:assertj-core")
 	optional("org.hamcrest:hamcrest-core")
 	optional("org.hamcrest:hamcrest-library")
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
@@ -47,9 +47,6 @@ dependencies {
 	optional("org.apache.commons:commons-dbcp2") {
 		exclude(group: "commons-logging", module: "commons-logging")
 	}
-	optional("org.apache.httpcomponents:httpclient") {
-		exclude(group: "commons-logging", module: "commons-logging")
-	}
 	optional("org.apache.httpcomponents.client5:httpclient5")
 	optional("org.apache.logging.log4j:log4j-api")
 	optional("org.apache.logging.log4j:log4j-core")
diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/build.gradle b/spring-boot-system-tests/spring-boot-deployment-tests/build.gradle
@@ -25,9 +25,7 @@ dependencies {
 	systemTestImplementation(enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent")))
 	systemTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	systemTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	systemTestImplementation("org.apache.httpcomponents:httpasyncclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	systemTestImplementation("org.apache.httpcomponents.client5:httpclient5")
 	systemTestImplementation("org.awaitility:awaitility")
 	systemTestImplementation("org.testcontainers:junit-jupiter")
 	systemTestImplementation("org.testcontainers:testcontainers")
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle
@@ -13,9 +13,7 @@ configurations {
 dependencies {
 	intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	intTestImplementation("org.apache.httpcomponents:httpasyncclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	intTestImplementation("org.apache.httpcomponents.client5:httpclient5")
 	intTestImplementation("org.awaitility:awaitility")
 	intTestImplementation("org.springframework:spring-web")
 
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle
@@ -13,7 +13,5 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 
-	testRuntimeOnly("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle
@@ -15,7 +15,5 @@ dependencies {
 	runtimeOnly("com.h2database:h2")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testRuntimeOnly("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle
@@ -13,7 +13,5 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 
-	testRuntimeOnly("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/build.gradle
@@ -10,7 +10,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle
@@ -11,7 +11,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle
@@ -11,4 +11,5 @@ dependencies {
 	implementation("org.springframework.security:spring-security-saml2-service-provider")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle
@@ -9,7 +9,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle
@@ -9,7 +9,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle
@@ -19,7 +19,5 @@ dependencies {
 	providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle
@@ -12,7 +12,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-undertow"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle
@@ -10,7 +10,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle
@@ -13,7 +13,5 @@ dependencies {
 	runtimeOnly("com.h2database:h2")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle
@@ -10,7 +10,5 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	testImplementation("org.apache.httpcomponents:httpclient") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 }

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ dependencies {`
`86`	`86`	`exclude group: "commons-logging", module: "commons-logging"`
`87`	`87`	`exclude group: "xml-apis", module: "xml-apis"`
`88`	`88`	`}`
	`89`	`+ implementation("org.apache.httpcomponents.client5:httpclient5")`
`89`	`90`	`implementation("org.apache.commons:commons-dbcp2") {`
`90`	`91`	`exclude group: "commons-logging", module: "commons-logging"`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,5 @@ dependencies {`
`13`	`13`
`14`	`14`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`15`	`15`
`16`		`- testRuntimeOnly("org.apache.httpcomponents:httpclient") {`
`17`		`- exclude group: "commons-logging", module: "commons-logging"`
`18`		`- }`
	`16`	`+ testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,5 @@ dependencies {`
`15`	`15`	`runtimeOnly("com.h2database:h2")`
`16`	`16`
`17`	`17`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`18`		`- testRuntimeOnly("org.apache.httpcomponents:httpclient") {`
`19`		`- exclude group: "commons-logging", module: "commons-logging"`
`20`		`- }`
	`18`	`+ testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,5 @@ dependencies {`
`10`	`10`	`implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))`
`11`	`11`
`12`	`12`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`13`		`- testImplementation("org.apache.httpcomponents:httpclient") {`
`14`		`- exclude group: "commons-logging", module: "commons-logging"`
`15`		`- }`
	`13`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5")`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,5 @@ dependencies {`
`11`	`11`	`implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux"))`
`12`	`12`
`13`	`13`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`14`		`- testImplementation("org.apache.httpcomponents:httpclient") {`
`15`		`- exclude group: "commons-logging", module: "commons-logging"`
`16`		`- }`
	`14`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5")`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@ dependencies {`
`11`	`11`	`implementation("org.springframework.security:spring-security-saml2-service-provider")`
`12`	`12`
`13`	`13`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
	`14`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5")`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,5 @@ dependencies {`
`9`	`9`	`implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))`
`10`	`10`
`11`	`11`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`12`		`- testImplementation("org.apache.httpcomponents:httpclient") {`
`13`		`- exclude group: "commons-logging", module: "commons-logging"`
`14`		`- }`
	`12`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5")`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,5 @@ dependencies {`
`19`	`19`	`providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")`
`20`	`20`
`21`	`21`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`22`		`- testImplementation("org.apache.httpcomponents:httpclient") {`
`23`		`- exclude group: "commons-logging", module: "commons-logging"`
`24`		`- }`
	`22`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5")`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,5 @@ dependencies {`
`12`	`12`	`implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-undertow"))`
`13`	`13`
`14`	`14`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`15`		`- testImplementation("org.apache.httpcomponents:httpclient") {`
`16`		`- exclude group: "commons-logging", module: "commons-logging"`
`17`		`- }`
	`15`	`+ testImplementation("org.apache.httpcomponents.client5:httpclient5")`
`18`	`16`	`}`