From 897c8e6999b67c8d23bbe917f463b11ff65a5ef3 Mon Sep 17 00:00:00 2001
From: j-sandy <30489233+j-sandy@users.noreply.github.com>
Date: Tue, 18 Oct 2022 16:29:14 +0000
Subject: [PATCH] chore(dependencies): Upgrade Spring Boot to 2.5.14

Spring boot 2.5.x brings groovy 3.x as its transitive dependency.
https://docs.spring.io/spring-boot/docs/2.5.14/reference/html/dependency-versions.html#appendix.dependency-versions

Currently spinnaker services use gradle 6.x, that does not support groovy 3.x.
https://docs.gradle.org/6.8.1/userguide/compatibility.html

Restricting groovy to 2.5.x using the code snippet suggested below, till upgrade of gradle to 7.x.
https://docs.gradle.org/current/userguide/resolution_rules.html#sec:denying_version
---
 build.gradle                                         | 8 ++++++++
 spinnaker-dependencies/spinnaker-dependencies.gradle | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 39c639391..53d7ccca7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,4 +41,12 @@ subprojects {
       testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
     }
   }
+  configurations.all {
+     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'org.codehaus.groovy') {
+            details.useVersion '2.5.15'
+            details.because 'Currently using gradle 6.x, upgrading springboot 2.5.x brings groovy 3.x, which is not supported by gradle 6.x. Upgrading to gradle 7.x will remove this constraint'
+        }
+     }
+  }
 }
diff --git a/spinnaker-dependencies/spinnaker-dependencies.gradle b/spinnaker-dependencies/spinnaker-dependencies.gradle
index abbc88435..eb61d0a7b 100644
--- a/spinnaker-dependencies/spinnaker-dependencies.gradle
+++ b/spinnaker-dependencies/spinnaker-dependencies.gradle
@@ -27,7 +27,7 @@ ext {
     spectator        : "1.0.6",
     spek             : "1.1.5",
     spek2            : "2.0.9",
-    springBoot       : "2.4.13",
+    springBoot       : "2.5.14",
     springCloud      : "2020.0.6",
     springfoxSwagger : "2.9.2",
     swagger          : "1.5.20", //this should stay in sync with what springfoxSwagger expects