From 2061b0869edc61e54f40354a6ee58007c033fe60 Mon Sep 17 00:00:00 2001
From: root <root@b3e368603f7c>
Date: Mon, 23 Sep 2024 16:43:30 +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 ba2f11a21..cadde40b7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-korkVersion=7.237.0
+korkVersion=7.238.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
 targetJava17=false

From 10d759f8ab660646c59fe9886539d5da1f4d8ca9 Mon Sep 17 00:00:00 2001
From: j-sandy <30489233+j-sandy@users.noreply.github.com>
Date: Mon, 9 Sep 2024 19:08:31 +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.
While upgrading groovy 4.0.15, encounter below error during build process of rosco-core module:
```
startup failed:
/rosco/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy: -1: Access to java.lang.Object#request_id is forbidden @ line -1, column -1.
1 error

> Task :rosco-core:compileGroovy FAILED
```
In order to make `request_id` accessible, removed `final` access specifier and updated the deprecated `ApiModelProperty.readOnly()` method with `ApiModelProperty.AccessMode()` [method](https://docs.swagger.io/swagger-core/v1.5.X/apidocs/io/swagger/annotations/ApiModelProperty.html#readOnly()).
---
 rosco-core/rosco-core.gradle                                  | 4 ++--
 .../groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy | 4 ++--
 rosco-web/rosco-web.gradle                                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rosco-core/rosco-core.gradle b/rosco-core/rosco-core.gradle
index cf4fab69e..7021b2019 100644
--- a/rosco-core/rosco-core.gradle
+++ b/rosco-core/rosco-core.gradle
@@ -1,7 +1,7 @@
 dependencies {
   api "io.spinnaker.kork:kork-artifacts"
   api "io.spinnaker.kork:kork-plugins"
-  api "org.codehaus.groovy:groovy"
+  api "org.apache.groovy:groovy"
 
   implementation "com.netflix.frigga:frigga"
   implementation "io.spinnaker.kork:kork-jedis"
@@ -12,7 +12,7 @@ dependencies {
   implementation "com.squareup.retrofit2:retrofit"
   implementation "io.reactivex:rxjava"
   implementation "org.apache.commons:commons-exec"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "redis.clients:jedis"
   testImplementation "org.spockframework:spock-core"
diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy
index ca566168a..dd521685e 100644
--- a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy
+++ b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy
@@ -37,8 +37,8 @@ import io.swagger.annotations.ApiModelProperty
 class BakeRequest {
 
   // A generated uuid which will identify the request and be used as the jobId when running the bake
-  @ApiModelProperty(value = "A generated UUID which will be used to identify the effective packer bake", readOnly = true)
-  final String request_id = UUID.randomUUID().toString()
+  @ApiModelProperty(value = "A generated UUID which will be used to identify the effective packer bake", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+  String request_id = UUID.randomUUID().toString()
   String user
   @ApiModelProperty("The package(s) to install, as a space-delimited string") @JsonProperty("package") @SerializedName("package")
   String package_name
diff --git a/rosco-web/rosco-web.gradle b/rosco-web/rosco-web.gradle
index c5517c8c3..e13f2d1b8 100644
--- a/rosco-web/rosco-web.gradle
+++ b/rosco-web/rosco-web.gradle
@@ -13,7 +13,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-web"
   implementation "io.swagger:swagger-annotations"
 
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "io.spinnaker.kork:kork-artifacts"
   implementation "io.spinnaker.kork:kork-config"
   implementation "org.springframework.boot:spring-boot-starter-web"