Skip to content

Commit 681d4c2

Browse files
committed
Remove unused dependency management from spring-boot-parent
See gh-43584
1 parent 60e0de7 commit 681d4c2

File tree

6 files changed

+6
-16
lines changed

6 files changed

+6
-16
lines changed

spring-boot-project/spring-boot-parent/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ bom {
168168
}
169169
library("OkHttp", "4.12.0") {
170170
group("com.squareup.okhttp3") {
171-
imports = [
172-
"okhttp-bom"
171+
modules = [
172+
"mockwebserver"
173173
]
174174
}
175175
}
@@ -210,8 +210,8 @@ bom {
210210
}
211211
library("Spock Framework", "2.3-groovy-4.0") {
212212
group("org.spockframework") {
213-
imports = [
214-
"spock-bom"
213+
modules = [
214+
"spock-core"
215215
]
216216
}
217217
}

spring-boot-project/spring-boot-test/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dependencies {
4444
testImplementation("io.mockk:mockk")
4545
testImplementation("jakarta.json:jakarta.json-api")
4646
testImplementation("ch.qos.logback:logback-classic")
47-
testImplementation("com.squareup.okhttp3:okhttp")
4847
testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
4948
testImplementation("org.apache.groovy:groovy")
5049
testImplementation("org.apache.groovy:groovy-xml")

spring-boot-project/spring-boot/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ dependencies {
106106
testImplementation("com.jayway.jsonpath:json-path")
107107
testImplementation("com.microsoft.sqlserver:mssql-jdbc")
108108
testImplementation("com.mysql:mysql-connector-j")
109-
testImplementation("com.squareup.okhttp3:okhttp")
110109
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
111110
testImplementation("io.projectreactor:reactor-test")
112111
testImplementation("io.r2dbc:r2dbc-h2")

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ void getOfReactorFactoryReturnsReactorFactory() {
7878
assertThat(requestFactory).isInstanceOf(ReactorClientHttpRequestFactory.class);
7979
}
8080

81-
@Test
82-
void getOfOkHttpFactoryReturnsOkHttpFactory() {
83-
ClientHttpRequestFactory requestFactory = ClientHttpRequestFactories.get(
84-
org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class,
85-
ClientHttpRequestFactorySettings.DEFAULTS);
86-
assertThat(requestFactory).isInstanceOf(org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class);
87-
}
88-
8981
@Test
9082
void getOfJdkFactoryReturnsJdkFactory() {
9183
ClientHttpRequestFactory requestFactory = ClientHttpRequestFactories.get(JdkClientHttpRequestFactory.class,

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ dependencies {
99
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
1010

1111
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
12-
testImplementation("com.squareup.okhttp3:mockwebserver:3.9.0")
12+
testImplementation("com.squareup.okhttp3:mockwebserver")
1313
}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ dependencies {
99
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux"))
1010

1111
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
12-
testImplementation("com.squareup.okhttp3:mockwebserver:3.9.0")
12+
testImplementation("com.squareup.okhttp3:mockwebserver")
1313
}

0 commit comments

Comments
 (0)