From d9cd1ca7a6f87d5eef0db6cb71416034d8c8906e Mon Sep 17 00:00:00 2001
From: root <root@b3e368603f7c>
Date: Mon, 23 Sep 2024 16:43:05 +0000
Subject: [PATCH 1/2] chore(dependencies): Autobump korkVersion

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 862a70512..3906f6785 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 fiatVersion=1.49.0
 includeProviders=azure,gcs,oracle,redis,s3,swift,sql
-korkVersion=7.237.0
+korkVersion=7.238.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
 targetJava17=false

From 01bb573adf775fe759ecd023d4ff40ffda01e198 Mon Sep 17 00:00:00 2001
From: j-sandy <30489233+j-sandy@users.noreply.github.com>
Date: Mon, 9 Sep 2024 19:31:52 +0530
Subject: [PATCH 2/2] refactor(dependency): replace groovy coordinates during
 upgrade of groovy 4.x

Replacing the groovy coordinates from `org.codehaus.groovy` to `org.apache.groovy` supported by groovy 4.x and above versions.
---
 build.gradle                       | 2 +-
 front50-redis/front50-redis.gradle | 2 +-
 front50-test/front50-test.gradle   | 2 +-
 front50-web/front50-web.gradle     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3277d8f5e..e4dea1f45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,7 @@ subprojects { project ->
       annotationProcessor("org.projectlombok:lombok")
       testAnnotationProcessor("org.projectlombok:lombok")
 
-      testImplementation("org.codehaus.groovy:groovy")
+      testImplementation("org.apache.groovy:groovy")
       testImplementation("org.spockframework:spock-core")
       testImplementation("org.springframework.boot:spring-boot-starter-test")
       testImplementation("org.spockframework:spock-spring")
diff --git a/front50-redis/front50-redis.gradle b/front50-redis/front50-redis.gradle
index fe8ffbb62..03e54b616 100644
--- a/front50-redis/front50-redis.gradle
+++ b/front50-redis/front50-redis.gradle
@@ -23,7 +23,7 @@ dependencies {
   implementation project(":front50-api")
   implementation "io.spinnaker.kork:kork-exceptions"
 
-  implementation("org.codehaus.groovy:groovy")
+  implementation("org.apache.groovy:groovy")
 
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "org.springframework.boot:spring-boot-starter-actuator"
diff --git a/front50-test/front50-test.gradle b/front50-test/front50-test.gradle
index 4db38d66e..31527711d 100644
--- a/front50-test/front50-test.gradle
+++ b/front50-test/front50-test.gradle
@@ -19,7 +19,7 @@ dependencies {
   implementation project(":front50-core")
   implementation project(":front50-s3")
 
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.spockframework:spock-core"
   implementation "com.amazonaws:aws-java-sdk-s3"
 }
diff --git a/front50-web/front50-web.gradle b/front50-web/front50-web.gradle
index 04b5adcec..a7f22c1f8 100644
--- a/front50-web/front50-web.gradle
+++ b/front50-web/front50-web.gradle
@@ -46,7 +46,7 @@ dependencies {
   testImplementation project(":front50-sql")
   testImplementation "io.spinnaker.kork:kork-sql-test"
   testImplementation "io.reactivex:rxjava"
-  testImplementation "org.codehaus.groovy:groovy-json"
+  testImplementation "org.apache.groovy:groovy-json"
 
   // Add each included cloud provider project as a runtime dependency
   gradle.includedProviderProjects.each {