Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt build dependencies to httpclient5

Browse Source 
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
This commit is contained in:
Brian Clozel
2022-09-21 14:21:53 +02:00
parent 3702c71fc1
commit 5fb2a50ad0
19 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-devtools/build.gradle
View File

@@ -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")

1
spring-boot-project/spring-boot-docs/build.gradle
View File

@@ -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"
}

4
spring-boot-project/spring-boot-test/build.gradle
View File

@@ -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")

3
spring-boot-project/spring-boot/build.gradle
View File

@@ -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")