Merge branch '4.0.x' into 4.1.x

Closes gh-51095

Author: snicoll

module/spring-boot-h2console/build.gradle

@@ -26,9 +26,10 @@ description = "Spring Boot H2"
 
 dependencies {
 	api(project(":core:spring-boot"))
-	api("jakarta.servlet:jakarta.servlet-api")
 	api("com.h2database:h2")
 
+	compileOnly("jakarta.servlet:jakarta.servlet-api")
+
 	optional(project(":core:spring-boot-autoconfigure"))
 
 	testImplementation(project(":core:spring-boot-test"))