Merge branch 'groovy-4.0'

buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java

@@ -76,6 +76,9 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
 		if (group.equals("javax.money")) {
 			return false;
 		}
+		if (group.equals("org.codehaus.groovy")) {
+			return true;
+		}
 		if (group.startsWith("javax")) {
 			return true;
 		}

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

@@ -67,7 +67,7 @@ dependencies {
 	optional("org.apache.tomcat.embed:tomcat-embed-websocket")
 	optional("org.apache.tomcat:tomcat-jdbc")
 	optional("org.apiguardian:apiguardian-api")
-	optional("org.codehaus.groovy:groovy-templates")
+	optional("org.apache.groovy:groovy-templates")
 	optional("com.github.ben-manes.caffeine:caffeine")
 	optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")
 	optional("com.sendgrid:sendgrid-java") {

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

@@ -16,7 +16,7 @@ configurations {
 dependencies {
 	compileOnly(project(":spring-boot-project:spring-boot"))
 	compileOnly("jakarta.servlet:jakarta.servlet-api")
-	compileOnly("org.codehaus.groovy:groovy-templates")
+	compileOnly("org.apache.groovy:groovy-templates")
 	compileOnly("org.springframework:spring-web")
 
 	dependenciesBom(project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "effectiveBom"))
@@ -41,7 +41,7 @@ dependencies {
 	implementation("org.apache.maven:maven-settings-builder") {
 		exclude group: "javax.inject", module: "javax.inject"
 	}
-	implementation("org.codehaus.groovy:groovy")
+	implementation("org.apache.groovy:groovy")
 	implementation("org.slf4j:slf4j-simple")
 	implementation("org.sonatype.plexus:plexus-sec-dispatcher")
 	implementation("org.sonatype.sisu:sisu-inject-plexus") {
@@ -64,7 +64,7 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation("org.assertj:assertj-core")
-	testImplementation("org.codehaus.groovy:groovy-templates")
+	testImplementation("org.apache.groovy:groovy-templates")
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.mockito:mockito-junit-jupiter")

spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt

@@ -43,7 +43,7 @@ SECTION 2: Apache License, V2.0
    >>> Plexus Cipher: encryption/decryption Component (org.sonatype.plexus:plexus-cipher)
    >>> Plexus Security Dispatcher Component (org.sonatype.plexus:plexus-sec-dispatcher)
    >>> Apache Commons Logging (commons-logging:commons-logging)
-   >>> Apache Groovy (org.codehaus.groovy:groovy)
+   >>> Apache Groovy (org.apache.groovy:groovy)
    >>> Maven Aether Provider (org.apache.maven:maven-aether-provider)
    >>> Maven Model (org.apache.maven:maven-model)
    >>> Maven Model Builder (org.apache.maven:maven-model-builder)
@@ -178,7 +178,7 @@ Apache License, V2.0 is applicable to the following component(s).
 >>> org.sonatype.plexus:plexus-cipher
 >>> org.sonatype.plexus:plexus-sec-dispatcher
 >>> commons-logging:commons-logging
->>> org.codehaus.groovy:groovy
+>>> org.apache.groovy:groovy
 >>> org.apache.maven:maven-aether-provider
 >>> org.apache.maven:maven-model
 >>> org.apache.maven:maven-model-builder

spring-boot-project/spring-boot-cli/src/test/resources/repro-samples/grab-ant-builder.groovy

@@ -1,4 +1,5 @@
-@Grab("org.codehaus.groovy:groovy-ant:2.1.6")
+@Grab("org.apache.groovy:groovy-ant:4.0.1")
+import groovy.ant.AntBuilder
 
 @RestController
 class MainController {

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

@@ -284,8 +284,8 @@ bom {
 			]
 		}
 	}
-	library("Groovy", "3.0.9") {
-		group("org.codehaus.groovy") {
+	library("Groovy", "4.0.1") {
+		group("org.apache.groovy") {
 			imports = [
 				"groovy-bom"
 			]
@@ -1448,7 +1448,7 @@ bom {
 			]
 		}
 	}
-	library("Thymeleaf Layout Dialect", "3.0.0") {
+	library("Thymeleaf Layout Dialect", "3.1.0") {
 		group("nz.net.ultraq.thymeleaf") {
 			modules = [
 				"thymeleaf-layout-dialect"

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

@@ -102,7 +102,7 @@ dependencies {
 	}
 	implementation("org.apache.tomcat.embed:tomcat-embed-core")
 	implementation("org.assertj:assertj-core")
-	implementation("org.codehaus.groovy:groovy")
+	implementation("org.apache.groovy:groovy")
 	implementation("org.hibernate:hibernate-jcache") {
 		exclude group: "javax.activation", module: "javax.activation-api"
 		exclude group: "javax.persistence", module: "javax.persistence-api"

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc

@@ -797,10 +797,10 @@ Alternatively, you can specify a source for your test, which disables the behavi
 
 [[features.testing.spring-boot-applications.spock]]
 ==== Using Spock to Test Spring Boot Applications
-Spock 2.x can be used to test a Spring Boot application.
-To do so, add a dependency on Spock's `spock-spring` module to your application's build.
+Spock 2.2 or later can be used to test a Spring Boot application.
+To do so, add a dependency on a `-groovy-4.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.0/modules.html#_spring_module[the documentation for Spock's Spring module] for further details.
+See https://spockframework.org/spock/docs/2.2-M1/modules.html#_spring_module[the documentation for Spock's Spring module] for further details.
 
 
 

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

@@ -154,11 +154,10 @@ bom {
 			]
 		}
 	}
-	library("Spock Framework", "2.0-groovy-3.0") {
+	library("Spock Framework", "2.2-M1-groovy-4.0") {
 		group("org.spockframework") {
-			modules = [
-				"spock-core",
-				"spock-spring"
+			imports = [
+				"spock-bom"
 			]
 		}
 	}

spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/build.gradle

@@ -6,5 +6,5 @@ description = "Starter for building MVC web applications using Groovy Templates
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
-	api("org.codehaus.groovy:groovy-templates")
+	api("org.apache.groovy:groovy-templates")
 }

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

@@ -46,8 +46,8 @@ dependencies {
 	testImplementation("ch.qos.logback:logback-classic")
 	testImplementation("com.squareup.okhttp3:okhttp")
 	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
-	testImplementation("org.codehaus.groovy:groovy")
-	testImplementation("org.codehaus.groovy:groovy-xml")
+	testImplementation("org.apache.groovy:groovy")
+	testImplementation("org.apache.groovy:groovy-xml")
 	testImplementation("org.eclipse:yasson")
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-junit-jupiter")

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

@@ -56,8 +56,8 @@ dependencies {
 	optional("org.apache.tomcat.embed:tomcat-embed-jasper")
 	optional("org.apache.tomcat:tomcat-jdbc")
 	optional("org.assertj:assertj-core")
-	optional("org.codehaus.groovy:groovy")
-	optional("org.codehaus.groovy:groovy-xml")
+	optional("org.apache.groovy:groovy")
+	optional("org.apache.groovy:groovy-xml")
 	optional("org.eclipse.jetty:jetty-servlets")
 	optional("org.eclipse.jetty:jetty-util")
 	optional("org.eclipse.jetty:jetty-webapp") {