Merge branch '3.0.x' into 3.1.x

Closes spring-projectsgh-37542

Author: wilkinsona

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

@@ -763,6 +763,9 @@ bom {
 				"kafka-metadata",
 				"kafka-raft",
 				"kafka-server-common",
+				"kafka-server-common" {
+					classifier = "test"
+				},
 				"kafka-shell",
 				"kafka-storage",
 				"kafka-storage-api",