Merge branch '2.2.x' into 2.3.x

Closes gh-22087

Author: wilkinsona

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

@@ -364,34 +364,8 @@ bom {
 	}
 	library("Groovy", "2.5.12") {
 		group("org.codehaus.groovy") {
-			modules = [
-				"groovy",
-				"groovy-ant",
-				"groovy-backports-compat23",
-				"groovy-bsf",
-				"groovy-cli-commons",
-				"groovy-cli-picocli",
-				"groovy-console",
-				"groovy-datetime",
-				"groovy-dateutil",
-				"groovy-docgenerator",
-				"groovy-groovydoc",
-				"groovy-groovysh",
-				"groovy-jaxb",
-				"groovy-jmx",
-				"groovy-json",
-				"groovy-json-direct",
-				"groovy-jsr223",
-				"groovy-macro",
-				"groovy-nio",
-				"groovy-servlet",
-				"groovy-sql",
-				"groovy-swing",
-				"groovy-templates",
-				"groovy-test",
-				"groovy-test-junit5",
-				"groovy-testng",
-				"groovy-xml"
+			imports = [
+				"groovy-bom"
 			]
 		}
 	}