Modularize spring-boot-test

Closes gh-46356

Author: wilkinsona

core/spring-boot-test/build.gradle

@@ -27,31 +27,18 @@ dependencies {
 	api(project(":core:spring-boot"))
 	api("org.springframework:spring-test")
 
-	optional("com.google.code.gson:gson")
-	optional("com.jayway.jsonpath:json-path")
-	optional("io.projectreactor.netty:reactor-netty-http")
-	optional("jakarta.json.bind:jakarta.json.bind-api")
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("junit:junit")
-	optional("org.apache.httpcomponents.client5:httpclient5")
 	optional("org.assertj:assertj-core")
 	optional("org.hamcrest:hamcrest-core")
 	optional("org.hamcrest:hamcrest-library")
 	optional("org.junit.jupiter:junit-jupiter-api")
 	optional("org.mockito:mockito-core")
-	optional("org.skyscreamer:jsonassert")
 	optional("org.springframework:spring-web")
-	optional("org.springframework:spring-webflux")
-	optional("org.springframework.graphql:spring-graphql-test")
-	optional("tools.jackson.core:jackson-databind")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation("ch.qos.logback:logback-classic")
-	testImplementation("io.mockk:mockk")
-	testImplementation("jakarta.json:jakarta.json-api")
-	testImplementation("org.apache.groovy:groovy")
-	testImplementation("org.apache.groovy:groovy-xml")
-	testImplementation("org.eclipse:yasson")
+	testImplementation("com.google.code.gson:gson")
 	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation("org.slf4j:slf4j-api")

core/spring-boot-test/src/main/resources/META-INF/spring.factories

@@ -1,8 +1,7 @@
 # Spring Test Context Customizer Factories
 org.springframework.test.context.ContextCustomizerFactory=\
 org.springframework.boot.test.context.ImportsContextCustomizerFactory,\
-org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\
-org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory
+org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory
 
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/spring-boot-applications.adoc

@@ -290,7 +290,7 @@ TIP: A list of the auto-configurations that are enabled by javadoc:org.springfra
 If you need to configure elements of the auto-configuration, you can use the javadoc:org.springframework.boot.json.test.autoconfigure.AutoConfigureJsonTesters[format=annotation] annotation.
 
 Spring Boot includes AssertJ-based helpers that work with the JSONAssert and JsonPath libraries to check that JSON appears as expected.
-The javadoc:org.springframework.boot.test.json.JacksonTester[], javadoc:org.springframework.boot.test.json.GsonTester[], javadoc:org.springframework.boot.test.json.JsonbTester[], and javadoc:org.springframework.boot.test.json.BasicJsonTester[] classes can be used for Jackson, Gson, Jsonb, and Strings respectively.
+The javadoc:org.springframework.boot.json.test.JacksonTester[], javadoc:org.springframework.boot.json.test.GsonTester[], javadoc:org.springframework.boot.json.test.JsonbTester[], and javadoc:org.springframework.boot.json.test.BasicJsonTester[] classes can be used for Jackson, Gson, Jsonb, and Strings respectively.
 Any helper fields on the test class can be javadoc:org.springframework.beans.factory.annotation.Autowired[format=annotation] when using javadoc:org.springframework.boot.json.test.autoconfigure.JsonTest[format=annotation].
 The following example shows a test class for Jackson:
 

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/springbootapplications/jsontests/MyJsonAssertJTests.java

@@ -19,8 +19,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.json.test.JacksonTester;
 import org.springframework.boot.json.test.autoconfigure.JsonTest;
-import org.springframework.boot.test.json.JacksonTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.within;

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/springbootapplications/jsontests/MyJsonTests.java

@@ -19,8 +19,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.json.test.JacksonTester;
 import org.springframework.boot.json.test.autoconfigure.JsonTest;
-import org.springframework.boot.test.json.JacksonTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/springbootapplications/jsontests/MyJsonAssertJTests.kt

@@ -22,7 +22,7 @@ import org.assertj.core.api.ThrowingConsumer
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.json.test.autoconfigure.JsonTest
-import org.springframework.boot.test.json.JacksonTester
+import org.springframework.boot.json.test.JacksonTester
 
 @JsonTest
 class MyJsonAssertJTests(@Autowired val json: JacksonTester<SomeObject>) {

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/springbootapplications/jsontests/MyJsonTests.kt

@@ -20,7 +20,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.json.test.autoconfigure.JsonTest
-import org.springframework.boot.test.json.JacksonTester
+import org.springframework.boot.json.test.JacksonTester
 
 @JsonTest
 class MyJsonTests(@Autowired val json: JacksonTester<VehicleDetails>) {

module/spring-boot-actuator/build.gradle

@@ -65,6 +65,7 @@ dependencies {
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":module:spring-boot-jackson"))
 	testImplementation(project(":module:spring-boot-jsonb"))
+	testImplementation(project(":module:spring-boot-json-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation("io.micrometer:micrometer-observation-test")
 	testImplementation("io.projectreactor:reactor-test")

module/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/JacksonJmxOperationResponseMapperTests.java

@@ -27,7 +27,7 @@
 import tools.jackson.databind.JavaType;
 import tools.jackson.databind.ObjectMapper;
 
-import org.springframework.boot.test.json.BasicJsonTester;
+import org.springframework.boot.json.test.BasicJsonTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;

module/spring-boot-json-test/build.gradle

@@ -32,7 +32,10 @@ dependencies {
 	optional(project(":module:spring-boot-jsonb"))
 	optional(project(":module:spring-boot-kotlin-serialization"))
 	optional(project(":module:spring-boot-test-autoconfigure"))
+	optional("com.jayway.jsonpath:json-path")
+	optional("org.assertj:assertj-core")
 	optional("org.junit.jupiter:junit-jupiter-api")
+	optional("org.skyscreamer:jsonassert")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))