From a06fd299a0f2c9ec1815aca664a971fae418e9f9 Mon Sep 17 00:00:00 2001
From: j-sandy <30489233+j-sandy@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:16:37 +0530
Subject: [PATCH] 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. Upgrading `@Wither` to `@With`, as suggested [here](https://projectlombok.org/features/With).
---
 build.gradle                                                  | 2 +-
 echo-core/echo-core.gradle                                    | 2 +-
 .../main/java/com/netflix/spinnaker/echo/model/Trigger.java   | 4 ++--
 echo-notifications/echo-notifications.gradle                  | 2 +-
 echo-pipelinetriggers/echo-pipelinetriggers.gradle            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index e76f2d5a4..acb261931 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ subprojects {
       annotationProcessor "org.projectlombok:lombok"
       testAnnotationProcessor "org.projectlombok:lombok"
 
-      implementation "org.codehaus.groovy:groovy"
+      implementation "org.apache.groovy:groovy"
       implementation "com.github.ben-manes.caffeine:guava"
       implementation "com.netflix.spectator:spectator-api"
       implementation "org.slf4j:slf4j-api"
diff --git a/echo-core/echo-core.gradle b/echo-core/echo-core.gradle
index efcb26c4a..d472c4eb2 100644
--- a/echo-core/echo-core.gradle
+++ b/echo-core/echo-core.gradle
@@ -44,5 +44,5 @@ dependencies {
 
     testImplementation "org.spockframework:spock-spring"
     testImplementation "org.springframework:spring-test"
-    testImplementation "org.codehaus.groovy:groovy-json"
+    testImplementation "org.apache.groovy:groovy-json"
 }
diff --git a/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Trigger.java b/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Trigger.java
index 051e1fdb6..1bca1e73d 100644
--- a/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Trigger.java
+++ b/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Trigger.java
@@ -26,7 +26,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +36,7 @@
  */
 @JsonDeserialize(builder = Trigger.TriggerBuilder.class)
 @Builder(toBuilder = true)
-@Wither
+@With
 @ToString(
     of = {
       "id",
diff --git a/echo-notifications/echo-notifications.gradle b/echo-notifications/echo-notifications.gradle
index 06504fe3e..263fa63be 100644
--- a/echo-notifications/echo-notifications.gradle
+++ b/echo-notifications/echo-notifications.gradle
@@ -33,7 +33,7 @@ dependencies {
   implementation "org.springframework.boot:spring-boot-starter-freemarker"
   implementation "org.jsoup:jsoup:1.8.3"
   implementation "com.atlassian.commonmark:commonmark:0.9.0"
-  implementation "org.codehaus.groovy:groovy-json"
+  implementation "org.apache.groovy:groovy-json"
   implementation "io.cloudevents:cloudevents-http-basic:3.0.0"
   implementation "io.cloudevents:cloudevents-json-jackson:3.0.0"
   implementation ("dev.cdevents:cdevents-sdk-java:0.3.1")
diff --git a/echo-pipelinetriggers/echo-pipelinetriggers.gradle b/echo-pipelinetriggers/echo-pipelinetriggers.gradle
index 6c6c85af3..587a6e01e 100644
--- a/echo-pipelinetriggers/echo-pipelinetriggers.gradle
+++ b/echo-pipelinetriggers/echo-pipelinetriggers.gradle
@@ -47,7 +47,7 @@ dependencies {
   testImplementation "org.springframework.boot:spring-boot-starter-test"
   testImplementation "org.junit.jupiter:junit-jupiter-api"
   testImplementation "org.assertj:assertj-core"
-  testImplementation "org.codehaus.groovy:groovy-json"
+  testImplementation "org.apache.groovy:groovy-json"
 
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }