Remove unused dependency management from spring-boot-parent

See gh-43584
spring-projects · Dec 20, 2024 · 681d4c2 · 681d4c2
1 parent 60e0de7
commit 681d4c2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle
@@ -168,8 +168,8 @@ bom {
 	}
 	library("OkHttp", "4.12.0") {
 		group("com.squareup.okhttp3") {
-			imports = [
-				"okhttp-bom"
+			modules = [
+				"mockwebserver"
 			]
 		}
 	}
@@ -210,8 +210,8 @@ bom {
 	}
 	library("Spock Framework", "2.3-groovy-4.0") {
 		group("org.spockframework") {
-			imports = [
-				"spock-bom"
+			modules = [
+				"spock-core"
 			]
 		}
 	}

diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle
@@ -44,7 +44,6 @@ dependencies {
 	testImplementation("io.mockk:mockk")
 	testImplementation("jakarta.json:jakarta.json-api")
 	testImplementation("ch.qos.logback:logback-classic")
-	testImplementation("com.squareup.okhttp3:okhttp")
 	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
 	testImplementation("org.apache.groovy:groovy")
 	testImplementation("org.apache.groovy:groovy-xml")

diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
@@ -106,7 +106,6 @@ dependencies {
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("com.microsoft.sqlserver:mssql-jdbc")
 	testImplementation("com.mysql:mysql-connector-j")
-	testImplementation("com.squareup.okhttp3:okhttp")
 	testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")

diff --git a/...ot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java b/...ot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
@@ -78,14 +78,6 @@ void getOfReactorFactoryReturnsReactorFactory() {
 		assertThat(requestFactory).isInstanceOf(ReactorClientHttpRequestFactory.class);
 	}
 
-	@Test
-	void getOfOkHttpFactoryReturnsOkHttpFactory() {
-		ClientHttpRequestFactory requestFactory = ClientHttpRequestFactories.get(
-				org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class,
-				ClientHttpRequestFactorySettings.DEFAULTS);
-		assertThat(requestFactory).isInstanceOf(org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class);
-	}
-
 	@Test
 	void getOfJdkFactoryReturnsJdkFactory() {
 		ClientHttpRequestFactory requestFactory = ClientHttpRequestFactories.get(JdkClientHttpRequestFactory.class,

diff --git a/...-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/build.gradle b/...-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/build.gradle
@@ -9,5 +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("com.squareup.okhttp3:mockwebserver:3.9.0")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
 }
diff --git a/...ring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle b/...ring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle
@@ -9,5 +9,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("com.squareup.okhttp3:mockwebserver:3.9.0")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
 }