Merge branch '4.0.x'

See gh-48823

buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/CheckAutoConfigurationClasses.java

@@ -163,13 +163,14 @@ public abstract class CheckAutoConfigurationClasses extends AutoConfigurationImp
 			problems.computeIfAbsent(autoConfigurationClass.name(), (name) -> new ArrayList<>())
 				.add("Name of a class annotated with @AutoConfiguration should end with AutoConfiguration");
 		}
+		boolean testAutoConfiguration = autoConfigurationClass.name().endsWith("TestAutoConfiguration");
 		if (!getOmittedFromImports().getOrElse(Collections.emptySet()).contains(autoConfigurationClass.name())
-				&& !imports.contains(autoConfigurationClass.name())) {
+				&& !imports.contains(autoConfigurationClass.name()) && !testAutoConfiguration) {
 			problems.computeIfAbsent(autoConfigurationClass.name(), (name) -> new ArrayList<>())
 				.add("Class is not registered in AutoConfiguration.imports");
 		}
-		if (getOmittedFromImports().getOrElse(requiredClassNames).contains(autoConfigurationClass.name())
+		if ((getOmittedFromImports().getOrElse(Collections.emptySet()).contains(autoConfigurationClass.name())
-				&& imports.contains(autoConfigurationClass.name())) {
+				|| testAutoConfiguration) && imports.contains(autoConfigurationClass.name())) {
 			problems.computeIfAbsent(autoConfigurationClass.name(), (name) -> new ArrayList<>())
 				.add("Class should not be registered in AutoConfiguration.imports");
 		}

module/spring-boot-gson/build.gradle

@@ -40,9 +40,3 @@ dependencies {
 tasks.named("compileTestJava") {
 	options.nullability.checking = "tests"
 }
-
-tasks.named("checkAutoConfigurationClasses") {
-	omittedFromImports = [
-		"org.springframework.boot.gson.autoconfigure.GsonTesterTestAutoConfiguration"
-	]
-}

module/spring-boot-jackson/build.gradle

@@ -44,9 +44,3 @@ dependencies {
 tasks.named("compileTestJava") {
 	options.nullability.checking = "tests"
 }
-
-tasks.named("checkAutoConfigurationClasses") {
-	omittedFromImports = [
-		"org.springframework.boot.jackson.autoconfigure.JacksonTesterTestAutoConfiguration"
-	]
-}

module/spring-boot-jackson2/build.gradle

@@ -50,9 +50,3 @@ dependencies {
 tasks.named("compileTestJava") {
 	options.nullability.checking = "tests"
 }
-
-tasks.named("checkAutoConfigurationClasses") {
-	omittedFromImports = [
-		"org.springframework.boot.jackson2.autoconfigure.Jackson2TesterTestAutoConfiguration"
-	]
-}

module/spring-boot-jsonb/build.gradle

@@ -41,9 +41,3 @@ dependencies {
 tasks.named("compileTestJava") {
 	options.nullability.checking = "tests"
 }
-
-tasks.named("checkAutoConfigurationClasses") {
-	omittedFromImports = [
-		"org.springframework.boot.jsonb.autoconfigure.JsonbTesterTestAutoConfiguration"
-	]
-}

module/spring-boot-resttestclient/build.gradle

@@ -47,10 +47,3 @@ dependencies {
 tasks.named("compileTestJava") {
 	options.nullability.checking = "tests"
 }
-
-tasks.named("checkAutoConfigurationClasses") {
-	omittedFromImports = [
-		"org.springframework.boot.resttestclient.autoconfigure.RestTestClientTestAutoConfiguration",
-		"org.springframework.boot.resttestclient.autoconfigure.TestRestTemplateTestAutoConfiguration"
-	]
-}