chore(dependencies): remove dependency on groovy-all where straightfo…

…rward (#5840)

with a specific goal to get org.testng:testng:7.4.0 out of shipping code, since it's vulnerable to
CVE-2022-4065.

Note: groovy-all and testng remain in clouddriver-yandex, but they're gone (besides test
configurations) elsewhere.

cats/cats-core/cats-core.gradle

@@ -3,7 +3,7 @@ dependencies {
 
   implementation "org.slf4j:slf4j-api"
   implementation "com.fasterxml.jackson.core:jackson-annotations"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "com.google.guava:guava"
 
   compileOnly "org.projectlombok:lombok"

cats/cats-redis/cats-redis.gradle

@@ -5,6 +5,7 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok"
   testAnnotationProcessor "org.projectlombok:lombok"
 
+  implementation "org.codehaus.groovy:groovy"
   implementation "com.fasterxml.jackson.core:jackson-databind"
   implementation "io.spinnaker.kork:kork-jedis"
   implementation "com.github.ben-manes.caffeine:guava"

cats/cats-test/cats-test.gradle

@@ -2,7 +2,7 @@ tasks.compileGroovy.enabled = true
 
 dependencies {
   implementation project(":cats:cats-core")
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
 
   implementation "org.springframework.boot:spring-boot-starter-test"
   implementation "org.spockframework:spock-core"

cats/cats.gradle

@@ -4,6 +4,6 @@ subprojects {
   dependencies {
     implementation project(":clouddriver-api")
 
-    implementation "org.codehaus.groovy:groovy-all"
+    implementation "org.codehaus.groovy:groovy"
   }
 }

clouddriver-alicloud/clouddriver-alicloud.gradle

@@ -28,7 +28,7 @@ dependencies {
   implementation 'com.aliyun:aliyun-java-sdk-ess:2.3.2'
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.apache.commons:commons-lang3"
 
   testImplementation "cglib:cglib-nodep"

clouddriver-appengine/clouddriver-appengine.gradle

@@ -27,7 +27,8 @@ dependencies {
   implementation "com.squareup.retrofit:retrofit"
   implementation "commons-io:commons-io"
   implementation "org.apache.commons:commons-compress:1.21"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
+  implementation "org.codehaus.groovy:groovy-json"
   implementation "org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"

clouddriver-artifacts/clouddriver-artifacts.gradle

@@ -51,7 +51,7 @@ dependencies {
   implementation "org.apache.commons:commons-lang3"
   implementation "org.apache.ivy:ivy:2.4.0"
   implementation "org.apache.maven:maven-resolver-provider:3.5.4"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
 

clouddriver-aws/clouddriver-aws.gradle

@@ -52,7 +52,7 @@ dependencies {
   implementation "io.reactivex:rxjava"
   implementation "org.apache.httpcomponents:httpclient"
   implementation "org.apache.httpcomponents:httpcore"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation 'com.aestasit.infrastructure.sshoogr:sshoogr:0.9.25'

clouddriver-azure/clouddriver-azure.gradle

@@ -10,7 +10,7 @@ dependencies {
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "io.spinnaker.kork:kork-exceptions"
   implementation "io.spinnaker.kork:kork-moniker"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "com.azure.resourcemanager:azure-resourcemanager:2.19.0"
@@ -22,6 +22,7 @@ dependencies {
   implementation "com.google.guava:guava:31.1-jre"
 
   testImplementation "cglib:cglib-nodep"
+  testImplementation "org.junit.jupiter:junit-jupiter-api"
   testImplementation "org.objenesis:objenesis"
   testImplementation "org.spockframework:spock-core"
   testImplementation "org.spockframework:spock-spring"

clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle

@@ -39,7 +39,7 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok"
   testAnnotationProcessor "org.projectlombok:lombok"
 
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
 
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "org.apache.commons:commons-lang3"

clouddriver-cloudrun/clouddriver-cloudrun.gradle

@@ -27,7 +27,7 @@ dependencies {
   implementation "com.squareup.retrofit:retrofit"
   implementation "commons-io:commons-io"
   implementation "org.apache.commons:commons-compress:1.20"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"

clouddriver-consul/clouddriver-consul.gradle

@@ -3,7 +3,8 @@ dependencies {
 
   implementation "com.squareup.okhttp:okhttp"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
+  implementation "org.codehaus.groovy:groovy-json"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
   testImplementation "cglib:cglib-nodep"

clouddriver-core-tck/clouddriver-core-tck.gradle

@@ -5,5 +5,5 @@ dependencies {
   implementation "junit:junit"
   implementation "org.apache.commons:commons-lang3"
   implementation "org.assertj:assertj-core"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
 }

clouddriver-core/clouddriver-core.gradle

@@ -44,7 +44,8 @@ dependencies {
   implementation "io.reactivex:rxjava"
   implementation "net.jodah:failsafe:1.0.4"
   implementation "org.apache.commons:commons-exec"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
+  implementation "org.codehaus.groovy:groovy-templates"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "redis.clients:jedis"
   implementation "org.jooq:jooq"

clouddriver-dcos/clouddriver-dcos.gradle

@@ -11,7 +11,7 @@ dependencies {
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "io.spinnaker.kork:kork-moniker"
   implementation "joda-time:joda-time:2.10.1"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation 'com.cerner.marathon:marathon-client:0.6.3'

clouddriver-docker/clouddriver-docker.gradle

@@ -10,7 +10,7 @@ dependencies {
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "org.springframework.cloud:spring-cloud-context"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "com.google.guava:guava"
   implementation "com.netflix.spectator:spectator-api"
   implementation "com.squareup.okhttp:okhttp"

clouddriver-ecs/clouddriver-ecs.gradle

@@ -44,7 +44,7 @@ dependencies {
   implementation "org.apache.commons:commons-lang3"
   implementation "org.apache.httpcomponents:httpclient"
   implementation "org.apache.httpcomponents:httpcore"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-test"
   implementation "org.springframework.boot:spring-boot-starter-web"
 

clouddriver-elasticsearch/clouddriver-elasticsearch.gradle

@@ -9,7 +9,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-retrofit"
   implementation "io.spinnaker.kork:kork-security"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.elasticsearch:elasticsearch"
   implementation "org.springframework.boot:spring-boot-starter-web"
 

clouddriver-eureka/clouddriver-eureka.gradle

@@ -8,7 +8,7 @@ dependencies {
   implementation "com.amazonaws:aws-java-sdk"
   implementation "com.squareup.retrofit:converter-jackson"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
   testImplementation "cglib:cglib-nodep"

clouddriver-google-common/clouddriver-google-common.gradle

@@ -11,7 +11,7 @@ dependencies {
   implementation "com.netflix.spectator:spectator-api"
   implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework.security:spring-security-config"
   implementation "org.springframework.security:spring-security-core"

clouddriver-google/clouddriver-google.gradle

@@ -11,7 +11,8 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok"
   testAnnotationProcessor "org.projectlombok:lombok"
 
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
+  implementation "org.codehaus.groovy:groovy-json"
   implementation "org.apache.commons:commons-lang3"
   implementation ("com.google.apis:google-api-services-compute:beta-rev20201102-1.30.10") {
     force = true

clouddriver-huaweicloud/clouddriver-huaweicloud.gradle

@@ -21,7 +21,7 @@ dependencies {
   }
   implementation "org.glassfish.jersey.core:jersey-client:2.22.1"
   implementation "org.glassfish.jersey.media:jersey-media-json-jackson:2.11"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation 'org.apache.commons:commons-lang3'

clouddriver-kubernetes/clouddriver-kubernetes.gradle

@@ -61,7 +61,7 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok"
   testAnnotationProcessor "org.projectlombok:lombok"
 
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
 
   implementation "com.google.code.findbugs:jsr305"
   implementation "com.google.guava:guava"

clouddriver-lambda/clouddriver-lambda.gradle

@@ -22,7 +22,7 @@ dependencies {
   implementation "org.apache.httpcomponents:httpclient"
   implementation "org.apache.httpcomponents:httpcore"
   implementation "org.apache.commons:commons-compress:1.20"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "com.squareup.okhttp:okhttp"
   implementation "com.squareup.okhttp:okhttp-apache"

clouddriver-oracle/clouddriver-oracle.gradle

@@ -18,11 +18,12 @@ dependencies {
   implementation "com.oracle.oci.sdk:oci-java-sdk-identity"
   implementation "com.oracle.oci.sdk:oci-java-sdk-loadbalancer"
   implementation "com.oracle.oci.sdk:oci-java-sdk-objectstorage"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
   testImplementation "cglib:cglib-nodep"
+  testImplementation "org.codehaus.groovy:groovy-all"
   testImplementation "org.objenesis:objenesis"
   testImplementation "org.spockframework:spock-core"
   testImplementation "org.spockframework:spock-spring"

clouddriver-security/clouddriver-security.gradle

@@ -9,7 +9,7 @@ dependencies {
   implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "io.spinnaker.kork:kork-core"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.slf4j:jcl-over-slf4j"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "com.github.ben-manes.caffeine:guava"

clouddriver-titus/clouddriver-titus.gradle

@@ -37,7 +37,8 @@ dependencies {
   implementation "io.grpc:grpc-netty-shaded:$grpcVersion"
   implementation "io.grpc:grpc-protobuf:$grpcVersion"
   implementation "io.grpc:grpc-stub:$grpcVersion"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
+  implementation "org.codehaus.groovy:groovy-json"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"

clouddriver-web/clouddriver-web.gradle

@@ -36,7 +36,7 @@ dependencies {
   implementation "commons-io:commons-io"
   implementation "io.reactivex:rxjava"
   implementation "io.swagger:swagger-annotations"
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework.boot:spring-boot-starter-actuator"
   implementation "org.springframework.boot:spring-boot-starter-json"

clouddriver-yandex/clouddriver-yandex.gradle

@@ -20,7 +20,7 @@ dependencies {
   compile("io.opencensus:opencensus-contrib-grpc-metrics:0.21.0") {
     force = true
   }
-  implementation "org.codehaus.groovy:groovy-all"
+  implementation "org.codehaus.groovy:groovy-all" // for at least org.apache.groovy.datetime.extensions.DateTimeExtensions
   implementation "org.apache.commons:commons-lang3"
   implementation "com.netflix.frigga:frigga"
   implementation "com.netflix.spectator:spectator-api"