Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
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
Show Stats 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")

4
spring-boot-system-tests/spring-boot-deployment-tests/build.gradle
View File

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

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle
View File

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

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle
View File

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

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle
View File

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