chore(dependencies): Autobump korkVersion (#1275)

* chore(dependencies): Autobump korkVersion * 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. Excluding the transitive groovy dependency from `org.jfrog.artifactory.client:artifactory-java-client-services:2.9.2`, and explictly adding the new coordinates of groovy to igor-monitor-artifactory module. --------- Co-authored-by: root <root@b3e368603f7c> Co-authored-by: j-sandy <[email protected]>
spinnaker · Sep 23, 2024 · 372f869 · 372f869
1 parent d1e6fd1
commit 372f869
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ subprojects {
       implementation "net.logstash.logback:logstash-logback-encoder"
 
       // TODO(rz): Why does Spock need groovy as implementation and not testImplementation to find tests?
-      implementation "org.codehaus.groovy:groovy"
+      implementation "org.apache.groovy:groovy"
       testImplementation "org.springframework.boot:spring-boot-starter-test"
       testImplementation "org.spockframework:spock-core"
       testImplementation "org.spockframework:spock-spring"

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.49.0
-korkVersion=7.237.0
+korkVersion=7.238.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
 targetJava17=false

diff --git a/igor-monitor-artifactory/igor-monitor-artifactory.gradle b/igor-monitor-artifactory/igor-monitor-artifactory.gradle
@@ -23,7 +23,10 @@ dependencies {
   implementation "org.springframework.boot:spring-boot-starter-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
-  implementation "org.jfrog.artifactory.client:artifactory-java-client-services:2.9.2"
+  implementation("org.jfrog.artifactory.client:artifactory-java-client-services:2.9.2") {
+    exclude group: "org.codehaus.groovy", module: "*"
+  }
+  implementation "org.apache.groovy:groovy"
 
   // TODO(rz): Get rid of this dependency!
   implementation "io.spinnaker.kork:kork-jedis"

diff --git a/igor-web/igor-web.gradle b/igor-web/igor-web.gradle
@@ -30,7 +30,7 @@ dependencies {
     testImplementation "org.hamcrest:hamcrest-core"
     testRuntimeOnly "cglib:cglib-nodep"
     testRuntimeOnly "org.objenesis:objenesis"
-    implementation "org.codehaus.groovy:groovy"
+    implementation "org.apache.groovy:groovy"
 
     implementation "com.fasterxml.jackson.core:jackson-annotations"
     implementation "com.fasterxml.jackson.core:jackson-core"
@@ -81,8 +81,8 @@ dependencies {
 
     testImplementation "com.squareup.okhttp:mockwebserver"
     testImplementation "io.spinnaker.kork:kork-jedis-test"
-    testImplementation "org.codehaus.groovy:groovy-datetime"
-    testImplementation "org.codehaus.groovy:groovy-json"
+    testImplementation "org.apache.groovy:groovy-datetime"
+    testImplementation "org.apache.groovy:groovy-json"
     testImplementation "org.junit.jupiter:junit-jupiter-api"
     testImplementation "org.assertj:assertj-core"