From ee72caf7dcd61b69ec0bd517c05bf8ec8a9b76f9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Sep 2025 18:30:57 -0700 Subject: [PATCH] Drop `spring-boot-rest-client-test` dependency from test starter See gh-46356 See gh-47322 --- .../build.gradle | 2 +- .../spring-boot-smoke-test-actuator-extension/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-actuator/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-devtools/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-hateoas/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-jetty/build.gradle | 2 +- .../build.gradle | 2 +- smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle | 2 +- .../spring-boot-smoke-test-oauth2-resource-server/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-prometheus/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-quartz/build.gradle | 2 +- .../spring-boot-smoke-test-saml2-service-provider/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-servlet/build.gradle | 2 +- .../spring-boot-smoke-test-session-data-mongodb/build.gradle | 2 +- .../spring-boot-smoke-test-session-data-redis/build.gradle | 2 +- .../spring-boot-smoke-test-session-hazelcast/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle | 2 +- .../spring-boot-smoke-test-tomcat-multi-connectors/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-tomcat/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-traditional/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle | 2 +- .../spring-boot-smoke-test-web-groovy-templates/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-jsp/build.gradle | 2 +- .../spring-boot-smoke-test-web-method-security/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-mustache/build.gradle | 2 +- .../spring-boot-smoke-test-web-secure-custom/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-secure/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-static/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle | 2 +- smoke-test/spring-boot-smoke-test-webflux/build.gradle | 2 +- starter/spring-boot-starter-test/build.gradle | 1 - system-test/spring-boot-deployment-system-tests/build.gradle | 2 +- 38 files changed, 37 insertions(+), 38 deletions(-) diff --git a/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle index 7e4a823db37..d4439662495 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle +++ b/smoke-test/spring-boot-smoke-test-actuator-custom-security/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5") diff --git a/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle index 66306dcb902..f2fab75bd7f 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle +++ b/smoke-test/spring-boot-smoke-test-actuator-extension/build.gradle @@ -24,6 +24,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-actuator")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } \ No newline at end of file diff --git a/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle b/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle index 9a3b8c97003..a67516bf54e 100644 --- a/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle +++ b/smoke-test/spring-boot-smoke-test-actuator-ui/build.gradle @@ -26,6 +26,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-security")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } \ No newline at end of file diff --git a/smoke-test/spring-boot-smoke-test-actuator/build.gradle b/smoke-test/spring-boot-smoke-test-actuator/build.gradle index 64520a27347..fdfebdd44db 100644 --- a/smoke-test/spring-boot-smoke-test-actuator/build.gradle +++ b/smoke-test/spring-boot-smoke-test-actuator/build.gradle @@ -30,7 +30,7 @@ dependencies { runtimeOnly("com.h2database:h2") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5") } \ No newline at end of file diff --git a/smoke-test/spring-boot-smoke-test-devtools/build.gradle b/smoke-test/spring-boot-smoke-test-devtools/build.gradle index 81d31c52a06..ea05e46c5fe 100644 --- a/smoke-test/spring-boot-smoke-test-devtools/build.gradle +++ b/smoke-test/spring-boot-smoke-test-devtools/build.gradle @@ -30,6 +30,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-hateoas/build.gradle b/smoke-test/spring-boot-smoke-test-hateoas/build.gradle index cd2ec6169aa..e9b57263700 100644 --- a/smoke-test/spring-boot-smoke-test-hateoas/build.gradle +++ b/smoke-test/spring-boot-smoke-test-hateoas/build.gradle @@ -23,6 +23,6 @@ description = "Spring Boot HATEOAS smoke test" dependencies { implementation(project(":starter:spring-boot-starter-hateoas")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle index dfd5b4df72c..b93b42cb39c 100644 --- a/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle +++ b/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle @@ -38,6 +38,6 @@ dependencies { runtimeOnly("org.glassfish.web:jakarta.servlet.jsp.jstl") testImplementation(project(":starter:spring-boot-starter-jetty")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle b/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle index c9d4c898a4e..70834ec2abd 100644 --- a/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle +++ b/smoke-test/spring-boot-smoke-test-jetty-ssl/build.gradle @@ -26,7 +26,7 @@ dependencies { exclude module: "spring-boot-starter-tomcat" } - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5") diff --git a/smoke-test/spring-boot-smoke-test-jetty/build.gradle b/smoke-test/spring-boot-smoke-test-jetty/build.gradle index b7f3e277e08..af1333a51be 100644 --- a/smoke-test/spring-boot-smoke-test-jetty/build.gradle +++ b/smoke-test/spring-boot-smoke-test-jetty/build.gradle @@ -26,6 +26,6 @@ dependencies { } implementation(project(":starter:spring-boot-starter-jetty")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/build.gradle b/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/build.gradle index 0f94febf7a7..d86065259d5 100644 --- a/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/build.gradle +++ b/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/build.gradle @@ -23,7 +23,7 @@ description = "Spring Boot OAuth2 Authorization Server smoke test" dependencies { implementation(project(":starter:spring-boot-starter-security-oauth2-authorization-server")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle b/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle index 6982d6b57f4..a085ab3421f 100644 --- a/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle +++ b/smoke-test/spring-boot-smoke-test-oauth2-client/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security-oauth2-client")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle b/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle index a2e1aa81205..6604e64c573 100644 --- a/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle +++ b/smoke-test/spring-boot-smoke-test-oauth2-resource-server/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security-oauth2-resource-server")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("com.squareup.okhttp3:mockwebserver") } diff --git a/smoke-test/spring-boot-smoke-test-prometheus/build.gradle b/smoke-test/spring-boot-smoke-test-prometheus/build.gradle index 5c2d9638c24..0e0bfd7bdca 100644 --- a/smoke-test/spring-boot-smoke-test-prometheus/build.gradle +++ b/smoke-test/spring-boot-smoke-test-prometheus/build.gradle @@ -28,6 +28,6 @@ dependencies { runtimeOnly('io.micrometer:micrometer-registry-prometheus') testImplementation(project(":module:spring-boot-micrometer-metrics-test")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-quartz/build.gradle b/smoke-test/spring-boot-smoke-test-quartz/build.gradle index 12e900c0583..61f39a5b1d5 100644 --- a/smoke-test/spring-boot-smoke-test-quartz/build.gradle +++ b/smoke-test/spring-boot-smoke-test-quartz/build.gradle @@ -28,7 +28,7 @@ dependencies { runtimeOnly("com.h2database:h2") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.awaitility:awaitility") } diff --git a/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle b/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle index f32d3845b00..df60e2b52a8 100644 --- a/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle +++ b/smoke-test/spring-boot-smoke-test-saml2-service-provider/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security-saml2")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-servlet/build.gradle b/smoke-test/spring-boot-smoke-test-servlet/build.gradle index 001350c44ab..fbff2765134 100644 --- a/smoke-test/spring-boot-smoke-test-servlet/build.gradle +++ b/smoke-test/spring-boot-smoke-test-servlet/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testRuntimeOnly(project(":starter:spring-boot-starter-tomcat")) diff --git a/smoke-test/spring-boot-smoke-test-session-data-mongodb/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-mongodb/build.gradle index 18d0f30ebcf..fe49c1cbe52 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-mongodb/build.gradle +++ b/smoke-test/spring-boot-smoke-test-session-data-mongodb/build.gradle @@ -29,7 +29,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) - dockerTestImplementation(project(":starter:spring-boot-starter-restclient")) + dockerTestImplementation(project(":starter:spring-boot-starter-restclient-test")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:mongodb") diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle index 5a98eefb755..bf3b3905327 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle @@ -29,7 +29,7 @@ dependencies { dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) - dockerTestImplementation(project(":starter:spring-boot-starter-restclient")) + dockerTestImplementation(project(":starter:spring-boot-starter-restclient-test")) dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation("com.redis:testcontainers-redis") dockerTestImplementation("org.testcontainers:junit-jupiter") diff --git a/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle b/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle index 15f4129e35a..f08103dffd2 100644 --- a/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle +++ b/smoke-test/spring-boot-smoke-test-session-hazelcast/build.gradle @@ -26,6 +26,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-session-hazelcast")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle b/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle index 2f447bee7c8..d9c04a71686 100644 --- a/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle +++ b/smoke-test/spring-boot-smoke-test-session-jdbc/build.gradle @@ -29,6 +29,6 @@ dependencies { runtimeOnly(project(":starter:spring-boot-starter-jdbc")) runtimeOnly("com.h2database:h2") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle index 7e752b12364..937468d3cd8 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle +++ b/smoke-test/spring-boot-smoke-test-tomcat-jsp/build.gradle @@ -33,6 +33,6 @@ dependencies { providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl") providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle index e3146d5407c..35230fcd5ec 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle +++ b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle @@ -23,7 +23,7 @@ description = "Spring Boot Tomcat multi-connectors smoke test" dependencies { implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle index ef7da56be0b..e48a0283af2 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle +++ b/smoke-test/spring-boot-smoke-test-tomcat-ssl/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-webmvc")) implementation(project(":starter:spring-boot-starter-actuator")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-tomcat/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat/build.gradle index 7b17f4a7d3e..510d3d0e7bf 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat/build.gradle +++ b/smoke-test/spring-boot-smoke-test-tomcat/build.gradle @@ -23,6 +23,6 @@ description = "Spring Boot Tomcat smoke test" dependencies { implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-traditional/build.gradle b/smoke-test/spring-boot-smoke-test-traditional/build.gradle index fa1d668182f..b5fc3229e03 100644 --- a/smoke-test/spring-boot-smoke-test-traditional/build.gradle +++ b/smoke-test/spring-boot-smoke-test-traditional/build.gradle @@ -33,7 +33,7 @@ dependencies { providedRuntime(project(":starter:spring-boot-starter-tomcat")) providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle b/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle index 3d089218566..56720d996c0 100644 --- a/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-freemarker/build.gradle @@ -24,6 +24,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-freemarker")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle b/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle index fcc424edb27..20708d29210 100644 --- a/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-groovy-templates/build.gradle @@ -27,6 +27,6 @@ dependencies { implementation("jakarta.xml.bind:jakarta.xml.bind-api") testImplementation(project(":module:spring-boot-webmvc-test")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle index 2593e33a303..58f37da0f99 100644 --- a/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-jsp/build.gradle @@ -33,6 +33,6 @@ dependencies { providedRuntime("org.glassfish.web:jakarta.servlet.jsp.jstl") providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle b/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle index e95a4d8d0fe..baad36adc6f 100644 --- a/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-method-security/build.gradle @@ -25,6 +25,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-security")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle b/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle index d02c9196739..1779535abed 100644 --- a/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-mustache/build.gradle @@ -24,6 +24,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-mustache")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle b/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle index a0b9350de61..dfdc6c2d08c 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-secure-custom/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle b/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle index f2e8d50c4c8..644dd152b57 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-secure-jdbc/build.gradle @@ -27,7 +27,7 @@ dependencies { runtimeOnly("com.h2database:h2") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-web-secure/build.gradle b/smoke-test/spring-boot-smoke-test-web-secure/build.gradle index 4de28c98e28..01dd72d0fcd 100644 --- a/smoke-test/spring-boot-smoke-test-web-secure/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-secure/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-security")) implementation(project(":starter:spring-boot-starter-webmvc")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } diff --git a/smoke-test/spring-boot-smoke-test-web-static/build.gradle b/smoke-test/spring-boot-smoke-test-web-static/build.gradle index 25715616b52..fcc13e4ae79 100644 --- a/smoke-test/spring-boot-smoke-test-web-static/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-static/build.gradle @@ -34,6 +34,6 @@ dependencies { runtimeOnly("org.webjars:bootstrap:3.0.3") runtimeOnly("org.webjars:jquery:2.0.3-1") - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle b/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle index 1c5d9d92442..f9f2c3bbfb6 100644 --- a/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle +++ b/smoke-test/spring-boot-smoke-test-web-thymeleaf/build.gradle @@ -26,6 +26,6 @@ dependencies { implementation(project(":starter:spring-boot-starter-validation")) testImplementation(project(":module:spring-boot-webmvc-test")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) } diff --git a/smoke-test/spring-boot-smoke-test-webflux/build.gradle b/smoke-test/spring-boot-smoke-test-webflux/build.gradle index aef59e3aa64..f13da15a448 100644 --- a/smoke-test/spring-boot-smoke-test-webflux/build.gradle +++ b/smoke-test/spring-boot-smoke-test-webflux/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-mustache")) implementation(project(":starter:spring-boot-starter-webflux")) - testImplementation(project(":starter:spring-boot-starter-restclient")) + testImplementation(project(":starter:spring-boot-starter-restclient-test")) testImplementation(project(":starter:spring-boot-starter-test")) testImplementation("io.projectreactor:reactor-test") } diff --git a/starter/spring-boot-starter-test/build.gradle b/starter/spring-boot-starter-test/build.gradle index 9b499469715..d3ec58cbcc7 100644 --- a/starter/spring-boot-starter-test/build.gradle +++ b/starter/spring-boot-starter-test/build.gradle @@ -26,7 +26,6 @@ dependencies { api(project(":core:spring-boot-test")) api(project(":core:spring-boot-test-autoconfigure")) - api(project(":module:spring-boot-restclient-test")) api("com.jayway.jsonpath:json-path") api("jakarta.xml.bind:jakarta.xml.bind-api") diff --git a/system-test/spring-boot-deployment-system-tests/build.gradle b/system-test/spring-boot-deployment-system-tests/build.gradle index a059363b1e4..fc2fe7657ac 100644 --- a/system-test/spring-boot-deployment-system-tests/build.gradle +++ b/system-test/spring-boot-deployment-system-tests/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation(project(":starter:spring-boot-starter-actuator")) systemTestImplementation(enforcedPlatform(project(path: ":platform:spring-boot-internal-dependencies"))) - systemTestImplementation(project(":starter:spring-boot-starter-restclient")) + systemTestImplementation(project(":starter:spring-boot-starter-restclient-test")) systemTestImplementation(project(":starter:spring-boot-starter-test")) systemTestImplementation(project(":test-support:spring-boot-test-support")) systemTestImplementation("org.apache.httpcomponents.client5:httpclient5")