From 0440a9a78cb0bda9132594b32835ecfdf3b208eb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 23 Jul 2020 10:55:47 +0200
Subject: [PATCH 1/2] Upgrade to Groovy 2.5.13

Closes gh-22505
---
 .bomr/bomr.yaml                                       | 4 ----
 spring-boot-project/spring-boot-cli/samples/ui.groovy | 2 +-
 spring-boot-project/spring-boot-dependencies/pom.xml  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.bomr/bomr.yaml b/.bomr/bomr.yaml
index 733593316c..3027b7b83a 100644
--- a/.bomr/bomr.yaml
+++ b/.bomr/bomr.yaml
@@ -16,10 +16,6 @@ bomr:
         versions:
           # Switches to Jarkarta EE API dependencies resulting in duplicate classes
           - '[2.3.2,2.4)'
-      - project: groovy
-        versions:
-          # Regression with @Log
-          - '[2.5.13,2.5.14)'
       - project: saaj-impl
         versions:
           # Switches to Jarkarta EE API dependencies resulting in duplicate classes
diff --git a/spring-boot-project/spring-boot-cli/samples/ui.groovy b/spring-boot-project/spring-boot-cli/samples/ui.groovy
index 7db73adb61..2cf456c623 100644
--- a/spring-boot-project/spring-boot-cli/samples/ui.groovy
+++ b/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
 	}
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index c23f7d2631..56e8ba7679 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -65,7 +65,7 @@
 		<elasticsearch.version>6.4.3</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<glassfish-jaxb.version>2.3.1</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>1.3</hamcrest.version>

From e9a966a0a25a53e18a6a55b85b7f587d25357581 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 23 Jul 2020 11:06:12 +0200
Subject: [PATCH 2/2] Upgrade to Groovy 2.5.13

Closes gh-22526
---
 spring-boot-project/spring-boot-dependencies/build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 17f8513147..6a00574515 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -362,10 +362,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"