Merge branch '2.1.x' into 2.2.x

Closes gh-22525

.bomr/bomr.yaml

@@ -12,10 +12,6 @@ bomr:
         versions:
           # 10.15 requires Java 9
           - '[10.15,)'
-      - project: groovy
-        versions:
-          # Regression with @Log
-          - '[2.5.13,2.5.14)'
   verify:
     ignored-dependencies:
       # Avoid conflicting transitive requirements for

spring-boot-project/spring-boot-cli/samples/ui.groovy

@@ -26,7 +26,7 @@ class MvcConfiguration extends WebMvcConfigurerAdapter {
 		log.info "Creating interceptor"
 		[
 			postHandle: { request, response, handler, mav ->
-				log.info "Intercepted: model=" + mav.model
+				MvcConfiguration.log.info "Intercepted: model=" + mav.model
 			}
 		] as HandlerInterceptorAdapter
 	}

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -66,7 +66,7 @@
 		<elasticsearch.version>6.8.10</elasticsearch.version>
 		<glassfish-el.version>3.0.3</glassfish-el.version>
 		<glassfish-jaxb.version>2.3.3</glassfish-jaxb.version>
-		<groovy.version>2.5.12</groovy.version>
+		<groovy.version>2.5.13</groovy.version>
 		<gson.version>2.8.6</gson.version>
 		<h2.version>1.4.200</h2.version>
 		<hamcrest.version>2.1</hamcrest.version>