Merge branch '2.3.x'

Closes gh-22527

Author: snicoll

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

@@ -349,10 +349,7 @@ bom {
 			]
 		}
 	}
-	library("Groovy", "2.5.12") {
-		prohibit("[2.5.13,2.5.14)") {
-			because "regression with @Log"
-		}
+	library("Groovy", "2.5.13") {
 		group("org.codehaus.groovy") {
 			imports = [
 				"groovy-bom"