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 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"