Reinstate Spock support

Closes gh-48513

Author: snicoll

core/spring-boot-test/build.gradle

@@ -54,10 +54,10 @@ dependencies {
 	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation("org.slf4j:slf4j-api")
+	testImplementation("org.spockframework:spock-core")
 	testImplementation("org.springframework:spring-webmvc")
 	testImplementation("org.testng:testng")
 
-	testRuntimeOnly("org.apache.groovy:groovy")
 	testRuntimeOnly("org.aspectj:aspectjrt")
 	testRuntimeOnly("org.aspectj:aspectjweaver")
 	testRuntimeOnly("org.junit.vintage:junit-vintage-engine")

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

@@ -228,6 +228,7 @@ static class ContextCustomizerKey {
 			annotationFilters.add(AnnotationFilter.PLAIN);
 			annotationFilters.add("kotlin.Metadata"::equals);
 			annotationFilters.add(AnnotationFilter.packages("kotlin.annotation"));
+			annotationFilters.add(AnnotationFilter.packages("org.spockframework", "spock"));
 			annotationFilters.add(AnnotationFilter.packages("org.junit"));
 			ANNOTATION_FILTERS = Collections.unmodifiableSet(annotationFilters);
 		}

core/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java

@@ -25,6 +25,9 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.spockframework.runtime.model.SpecMetadata;
+import spock.lang.Issue;
+import spock.lang.Stepwise;
 
 import org.springframework.boot.context.annotation.DeterminableImports;
 import org.springframework.context.annotation.Configuration;
@@ -61,6 +64,18 @@ void customizersForTestClassesWithDifferentKotlinMetadataAreEqual() {
 			.isEqualTo(new ImportsContextCustomizer(SecondKotlinAnnotatedTestClass.class));
 	}
 
+	@Test
+	void customizersForTestClassesWithDifferentSpockFrameworkAnnotationsAreEqual() {
+		assertThat(new ImportsContextCustomizer(FirstSpockFrameworkAnnotatedTestClass.class))
+			.isEqualTo(new ImportsContextCustomizer(SecondSpockFrameworkAnnotatedTestClass.class));
+	}
+
+	@Test
+	void customizersForTestClassesWithDifferentSpockLangAnnotationsAreEqual() {
+		assertThat(new ImportsContextCustomizer(FirstSpockLangAnnotatedTestClass.class))
+			.isEqualTo(new ImportsContextCustomizer(SecondSpockLangAnnotatedTestClass.class));
+	}
+
 	@Test
 	void customizersForTestClassesWithDifferentJUnitAnnotationsAreEqual() {
 		assertThat(new ImportsContextCustomizer(FirstJUnitAnnotatedTestClass.class))
@@ -127,6 +142,30 @@ static class SecondKotlinAnnotatedTestClass {
 
 	}
 
+	@SpecMetadata(filename = "foo", line = 10)
+	@Import(TestImportSelector.class)
+	static class FirstSpockFrameworkAnnotatedTestClass {
+
+	}
+
+	@SpecMetadata(filename = "bar", line = 10)
+	@Import(TestImportSelector.class)
+	static class SecondSpockFrameworkAnnotatedTestClass {
+
+	}
+
+	@Stepwise
+	@Import(TestImportSelector.class)
+	static class FirstSpockLangAnnotatedTestClass {
+
+	}
+
+	@Issue("1234")
+	@Import(TestImportSelector.class)
+	static class SecondSpockLangAnnotatedTestClass {
+
+	}
+
 	@Nested
 	@Import(TestImportSelector.class)
 	static class FirstJUnitAnnotatedTestClass {

documentation/spring-boot-docs/src/docs/antora/modules/ROOT/pages/redirect.adoc

@@ -1901,6 +1901,8 @@
 * xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.mocking-beans[#boot-features-testing-spring-boot-applications-mocking-beans]
 * xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.mocking-beans[#features.testing.spring-boot-applications.mocking-beans]
 * xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.observations[#features.testing.spring-boot-applications.observations]
+* xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.spock[#boot-features-testing-spring-boot-applications-with-spock]
+* xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.spock[#features.testing.spring-boot-applications.spock]
 * xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.spring-graphql-tests[#features.testing.spring-boot-applications.spring-graphql-tests]
 * xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.spring-mvc-tests[#boot-features-testing-spring-boot-applications-testing-autoconfigured-mvc-tests]
 * xref:reference:testing/spring-boot-applications.adoc#testing.spring-boot-applications.spring-mvc-tests[#features.testing.spring-boot-applications.spring-mvc-tests]

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

@@ -925,3 +925,11 @@ TIP: If this is not an option for you, you can create a javadoc:org.springframew
 Alternatively, you can specify a source for your test, which disables the behavior of finding a default one.
 
 
+
+[[testing.spring-boot-applications.spock]]
+== Using Spock to Test Spring Boot Applications
+
+Spock 2.4 or later can be used to test a Spring Boot application.
+To do so, add a dependency on a `-groovy-5.0` version of Spock's `spock-spring` module to your application's build.
+`spock-spring` integrates Spring's test framework into Spock.
+See https://spockframework.org/spock/docs/2.4/modules.html#spring-module[the documentation for Spock's Spring module] for further details.

module/spring-boot-health/src/test/java/org/springframework/boot/health/contributor/StatusTests.java

@@ -59,7 +59,7 @@ void getDescriptionReturnsDescription() {
 	void equalsAndHashCode() {
 		Status one = new Status("spring", "boot");
 		Status two = new Status("spring", "framework");
-		Status three = new Status("another", "framework");
+		Status three = new Status("spock", "framework");
 		assertThat(one).isEqualTo(one).isEqualTo(two).isNotEqualTo(three);
 		assertThat(one).hasSameHashCodeAs(two);
 	}

platform/spring-boot-internal-dependencies/build.gradle

@@ -235,6 +235,13 @@ bom {
 			]
 		}
 	}
+	library("Spock Framework", "2.4-groovy-5.0") {
+		group("org.spockframework") {
+			modules = [
+				"spock-core"
+			]
+		}
+	}
 	library("TestNG", "6.14.3") {
 		group("org.testng") {
 			modules = [