diff --git a/cats/cats-core/cats-core.gradle b/cats/cats-core/cats-core.gradle
index dcaa4cc9fb3..5d2e23405b7 100644
--- a/cats/cats-core/cats-core.gradle
+++ b/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"
+  implementation "org.apache.groovy:groovy"
   implementation "com.google.guava:guava"
 
   testImplementation project(":cats:cats-test")
diff --git a/cats/cats-redis/cats-redis.gradle b/cats/cats-redis/cats-redis.gradle
index f086a471e42..92e2ab9a0d0 100644
--- a/cats/cats-redis/cats-redis.gradle
+++ b/cats/cats-redis/cats-redis.gradle
@@ -3,7 +3,7 @@ dependencies {
 
   compileOnly "org.projectlombok:lombok"
 
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "com.fasterxml.jackson.core:jackson-databind"
   implementation "io.spinnaker.kork:kork-jedis"
   implementation "com.github.ben-manes.caffeine:guava"
diff --git a/cats/cats-test/cats-test.gradle b/cats/cats-test/cats-test.gradle
index f4fbf82f912..7491388bec1 100644
--- a/cats/cats-test/cats-test.gradle
+++ b/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"
+  implementation "org.apache.groovy:groovy"
 
   implementation "org.springframework.boot:spring-boot-starter-test"
   implementation "org.spockframework:spock-core"
diff --git a/cats/cats.gradle b/cats/cats.gradle
index da9cf367101..9f6d7477256 100644
--- a/cats/cats.gradle
+++ b/cats/cats.gradle
@@ -4,6 +4,6 @@ subprojects {
   dependencies {
     implementation project(":clouddriver-api")
 
-    implementation "org.codehaus.groovy:groovy"
+    implementation "org.apache.groovy:groovy"
   }
 }
diff --git a/clouddriver-alicloud/clouddriver-alicloud.gradle b/clouddriver-alicloud/clouddriver-alicloud.gradle
index 54f1e1c24cd..0ac9a0ae6dd 100644
--- a/clouddriver-alicloud/clouddriver-alicloud.gradle
+++ b/clouddriver-alicloud/clouddriver-alicloud.gradle
@@ -24,7 +24,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"
+  implementation "org.apache.groovy:groovy"
   implementation "org.apache.commons:commons-lang3"
 
   testImplementation "cglib:cglib-nodep"
diff --git a/clouddriver-appengine/clouddriver-appengine.gradle b/clouddriver-appengine/clouddriver-appengine.gradle
index c056f13c59f..a7a7048bc07 100644
--- a/clouddriver-appengine/clouddriver-appengine.gradle
+++ b/clouddriver-appengine/clouddriver-appengine.gradle
@@ -26,8 +26,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"
-  implementation "org.codehaus.groovy:groovy-json"
+  implementation "org.apache.groovy:groovy"
+  implementation "org.apache.groovy:groovy-json"
   implementation "org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:5.13.1.202206130422-r"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.groovy
index 90f24e649c8..ea763d35b5a 100644
--- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.groovy
+++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.groovy
@@ -66,6 +66,9 @@ class AppengineServerGroup implements ServerGroup, Serializable {
     this.allowsGradualTrafficMigration = versionAllowsGradualTrafficMigration(version)
   }
 
+  Boolean isDisabled() {
+    disabled
+  }
   @Override
   ServerGroup.InstanceCounts getInstanceCounts() {
     new ServerGroup.InstanceCounts(
diff --git a/clouddriver-artifacts/clouddriver-artifacts.gradle b/clouddriver-artifacts/clouddriver-artifacts.gradle
index 773d6389960..e0f77f78a3f 100644
--- a/clouddriver-artifacts/clouddriver-artifacts.gradle
+++ b/clouddriver-artifacts/clouddriver-artifacts.gradle
@@ -48,7 +48,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"
+  implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
@@ -71,10 +71,7 @@ dependencies {
   integrationImplementation "org.testcontainers:mysql"
   integrationImplementation "org.testcontainers:junit-jupiter"
   integrationImplementation "com.mysql:mysql-connector-j"
-  integrationImplementation ("io.rest-assured:rest-assured:4.0.0") {
-    // Exclude groovy pulled in by rest-assured, so we use kork's version
-    exclude group: "org.codehaus.groovy", module: "groovy"
-  }
+  integrationImplementation "io.rest-assured:rest-assured"
 }
 
 task integrationTest(type: Test) {
diff --git a/clouddriver-aws/clouddriver-aws.gradle b/clouddriver-aws/clouddriver-aws.gradle
index b6c628e891e..5cbdd261df9 100644
--- a/clouddriver-aws/clouddriver-aws.gradle
+++ b/clouddriver-aws/clouddriver-aws.gradle
@@ -48,7 +48,7 @@ dependencies {
   implementation "io.reactivex:rxjava"
   implementation "org.apache.httpcomponents:httpclient"
   implementation "org.apache.httpcomponents:httpcore"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.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'
@@ -71,9 +71,7 @@ dependencies {
   integrationImplementation "org.springframework:spring-test"
   integrationImplementation sourceSets.test.output
   integrationImplementation sourceSets.main.output
-  integrationImplementation ("io.rest-assured:rest-assured:4.0.0") {
-    exclude group: "org.codehaus.groovy", module: "groovy" // use kork's version
-  }
+  integrationImplementation "io.rest-assured:rest-assured"
 }
 
 task integrationTest(type: Test) {
diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/handlers/BasicAmazonDeployHandler.groovy b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/handlers/BasicAmazonDeployHandler.groovy
index ef9a42f774a..d6418983daf 100644
--- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/handlers/BasicAmazonDeployHandler.groovy
+++ b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/handlers/BasicAmazonDeployHandler.groovy
@@ -381,7 +381,7 @@ class BasicAmazonDeployHandler implements DeployHandler<BasicAmazonDeployDescrip
       )
 
       if (serverGroup) {
-        String subnetIdTag = serverGroup.asg.tags.find { it.key == SUBNET_ID_OVERRIDE_TAG }?.value
+        String subnetIdTag = serverGroup.asg.tags.find { it.key == BasicAmazonDeployHandler.SUBNET_ID_OVERRIDE_TAG }?.value
         if (subnetIdTag) {
           // source server group had subnet id overrides, propagate them forward
           description.subnetIds = subnetIdTag.split(",")
diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonMetricDescriptor.groovy b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonMetricDescriptor.groovy
index 25accbe25ba..e61a6b45bf6 100644
--- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonMetricDescriptor.groovy
+++ b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/model/AmazonMetricDescriptor.groovy
@@ -20,9 +20,7 @@ import com.amazonaws.services.cloudwatch.model.Dimension
 import com.amazonaws.services.cloudwatch.model.Metric
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.netflix.spinnaker.clouddriver.model.CloudMetricDescriptor
-import groovy.transform.Immutable
 
-@Immutable
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 class AmazonMetricDescriptor implements CloudMetricDescriptor {
   final String cloudProvider = 'aws'
@@ -30,6 +28,12 @@ class AmazonMetricDescriptor implements CloudMetricDescriptor {
   final String name
   final List<Dimension> dimensions
 
+  AmazonMetricDescriptor (String cloudProvider, String namespace, String name, List<Dimension> dimensions) {
+    this.cloudProvider = cloudProvider
+    this.namespace = namespace
+    this.name = name
+    this.dimensions = dimensions
+  }
   static AmazonMetricDescriptor from(Metric metric) {
     new AmazonMetricDescriptor('aws', metric.namespace, metric.metricName, metric.dimensions)
   }
diff --git a/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy b/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy
index 573a5ba91b7..81d62bf46d5 100644
--- a/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy
+++ b/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy
@@ -36,4 +36,8 @@ class SimpleServerGroup implements ServerGroup {
   ServerGroup.Capacity capacity
   ServerGroup.ImageSummary imageSummary
   ServerGroup.ImagesSummary imagesSummary
+
+  Boolean isDisabled() {
+    disabled
+  }
 }
diff --git a/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy b/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy
index b1e24749ca8..3972659057b 100644
--- a/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy
+++ b/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy
@@ -572,5 +572,9 @@ class DiscoverySupportUnitSpec extends Specification {
     ServerGroup.Capacity capacity
     ServerGroup.ImageSummary getImageSummary() {}
     ServerGroup.ImagesSummary getImagesSummary() {}
+
+    Boolean isDisabled() {
+      disabled
+    }
   }
 }
diff --git a/clouddriver-azure/clouddriver-azure.gradle b/clouddriver-azure/clouddriver-azure.gradle
index 09b4218895d..09ea2e74ed1 100644
--- a/clouddriver-azure/clouddriver-azure.gradle
+++ b/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"
+  implementation "org.apache.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"
diff --git a/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/model/AzureServerGroupDescription.groovy b/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/model/AzureServerGroupDescription.groovy
index e839b83b675..a72eb81a9d5 100644
--- a/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/model/AzureServerGroupDescription.groovy
+++ b/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/model/AzureServerGroupDescription.groovy
@@ -128,6 +128,10 @@ class AzureServerGroupDescription extends AzureResourceOpsDescription implements
     String.format("%s-%s-%s", application, stack, detail)
   }
 
+  Boolean isDisabled() {
+    disabled
+  }
+
   @Override
   Set<String> getLoadBalancers() {
     if(this.appGatewayName != null) return Sets.newHashSet(this.appGatewayName)
diff --git a/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/ops/preprocessors/RegionsToRegionDescriptionPreProcessor.groovy b/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/ops/preprocessors/RegionsToRegionDescriptionPreProcessor.groovy
index 6152abcce93..cb45a89312b 100644
--- a/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/ops/preprocessors/RegionsToRegionDescriptionPreProcessor.groovy
+++ b/clouddriver-azure/src/main/groovy/com/netflix/spinnaker/clouddriver/azure/resources/servergroup/ops/preprocessors/RegionsToRegionDescriptionPreProcessor.groovy
@@ -19,11 +19,17 @@ package com.netflix.spinnaker.clouddriver.azure.resources.servergroup.ops.prepro
 import com.netflix.spinnaker.clouddriver.azure.resources.servergroup.model.EnableDisableDestroyAzureServerGroupDescription
 import com.netflix.spinnaker.clouddriver.orchestration.AtomicOperationDescriptionPreProcessor
 import groovy.util.logging.Slf4j
+import org.slf4j.Logger
 import org.springframework.stereotype.Component
 
 @Slf4j
 @Component
 class RegionsToRegionDescriptionPreProcessor implements AtomicOperationDescriptionPreProcessor {
+
+  private Logger getLog() {
+    return log
+  }
+
   @Override
   boolean supports(Class descriptionClass) {
     return descriptionClass == EnableDisableDestroyAzureServerGroupDescription
@@ -36,7 +42,7 @@ class RegionsToRegionDescriptionPreProcessor implements AtomicOperationDescripti
         region = regions[0]
 
         if (regions.size() > 1) {
-          log.warn("EnableDisableDestroyAzureServerGroupDescription has regions size greater than 1: $regions")
+          getLog().warn("EnableDisableDestroyAzureServerGroupDescription has regions size greater than 1: $regions")
         }
       }
 
diff --git a/clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle b/clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle
index 3854b120357..d045a3c8a6f 100644
--- a/clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle
+++ b/clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle
@@ -18,7 +18,7 @@ dependencies {
   implementation project(":cats:cats-core")
   implementation project(":clouddriver-docker")
 
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
 
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "org.apache.commons:commons-lang3"
diff --git a/clouddriver-cloudrun/clouddriver-cloudrun.gradle b/clouddriver-cloudrun/clouddriver-cloudrun.gradle
index aa895933fc5..4ea15c393fa 100644
--- a/clouddriver-cloudrun/clouddriver-cloudrun.gradle
+++ b/clouddriver-cloudrun/clouddriver-cloudrun.gradle
@@ -23,7 +23,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"
+  implementation "org.apache.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"
diff --git a/clouddriver-consul/clouddriver-consul.gradle b/clouddriver-consul/clouddriver-consul.gradle
index 1c31b58493d..9e1635fb125 100644
--- a/clouddriver-consul/clouddriver-consul.gradle
+++ b/clouddriver-consul/clouddriver-consul.gradle
@@ -4,8 +4,8 @@ dependencies {
   implementation "com.squareup.okhttp:okhttp"
   implementation "com.squareup.retrofit:converter-jackson"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "org.codehaus.groovy:groovy"
-  implementation "org.codehaus.groovy:groovy-json"
+  implementation "org.apache.groovy:groovy"
+  implementation "org.apache.groovy:groovy-json"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "io.spinnaker.kork:kork-retrofit"
   implementation "io.spinnaker.kork:kork-exceptions"
diff --git a/clouddriver-core-tck/clouddriver-core-tck.gradle b/clouddriver-core-tck/clouddriver-core-tck.gradle
index cad8ab60f4a..eae67808f6b 100644
--- a/clouddriver-core-tck/clouddriver-core-tck.gradle
+++ b/clouddriver-core-tck/clouddriver-core-tck.gradle
@@ -5,5 +5,5 @@ dependencies {
   implementation "org.junit.jupiter:junit-jupiter-api"
   implementation "org.apache.commons:commons-lang3"
   implementation "org.assertj:assertj-core"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
 }
diff --git a/clouddriver-core/clouddriver-core.gradle b/clouddriver-core/clouddriver-core.gradle
index f7c75f4ff3c..b7fc64e86cd 100644
--- a/clouddriver-core/clouddriver-core.gradle
+++ b/clouddriver-core/clouddriver-core.gradle
@@ -13,7 +13,7 @@ dependencies {
 
   // This is because some classes in this module use the Groovy @Immutable annotation,
   // which appears to require consumers to have core groovy on the classpath
-  api "org.codehaus.groovy:groovy"
+  api "org.apache.groovy:groovy"
 
   implementation "javax.inject:javax.inject:1"
   implementation "javax.validation:validation-api"
@@ -41,8 +41,8 @@ dependencies {
   implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "io.reactivex:rxjava"
   implementation "net.jodah:failsafe:1.0.4"
-  implementation "org.codehaus.groovy:groovy"
-  implementation "org.codehaus.groovy:groovy-templates"
+  implementation "org.apache.groovy:groovy"
+  implementation "org.apache.groovy:groovy-templates"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "redis.clients:jedis"
   implementation "org.jooq:jooq"
diff --git a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/data/task/InMemoryTaskRepository.groovy b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/data/task/InMemoryTaskRepository.groovy
index 392f4dab7ee..44d72ad1886 100644
--- a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/data/task/InMemoryTaskRepository.groovy
+++ b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/data/task/InMemoryTaskRepository.groovy
@@ -51,7 +51,7 @@ class InMemoryTaskRepository implements TaskRepository {
   List<Task> list() {
     List<Task> tasks = new ArrayList<>();
     for (Task value : repository.values()) {
-      if (!value.getStatus().completed) {
+      if (!value.getStatus().isCompleted()) {
         tasks.add(value)
       }
     }
diff --git a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessor.groovy b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessor.groovy
index 73a23416755..f4c17ea9e95 100644
--- a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessor.groovy
+++ b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessor.groovy
@@ -130,7 +130,7 @@ class DefaultOrchestrationProcessor implements OrchestrationProcessor {
                 }
               }
 
-              if (task.status?.failed) {
+              if (task.status?.isFailed()) {
                 task.updateStatus(TASK_PHASE, "Orchestration completed with errors, see prior task logs.")
               } else {
                 task.updateStatus(TASK_PHASE, "Orchestration completed.")
diff --git a/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/core/ProjectClustersServiceSpec.groovy b/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/core/ProjectClustersServiceSpec.groovy
index 578fc61ce36..93e31c29005 100644
--- a/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/core/ProjectClustersServiceSpec.groovy
+++ b/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/core/ProjectClustersServiceSpec.groovy
@@ -492,7 +492,7 @@ class ProjectClustersServiceSpec extends Specification {
     String type = "test"
     String cloudProvider = "test"
     String region
-    boolean disabled
+    Boolean disabled
     Set<String> instances = []
     Set<String> loadBalancers
     Set<String> securityGroups
diff --git a/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy b/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy
index 1171b46eda8..266529baf44 100644
--- a/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy
+++ b/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy
@@ -33,4 +33,8 @@ class SimpleServerGroup implements ServerGroup {
   Capacity capacity
   ImagesSummary imagesSummary
   ImageSummary imageSummary
+
+  Boolean isDisabled() {
+    disabled
+  }
 }
diff --git a/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessorSpec.groovy b/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessorSpec.groovy
index 1187dd792b9..8b8000e1999 100644
--- a/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessorSpec.groovy
+++ b/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessorSpec.groovy
@@ -113,7 +113,7 @@ class DefaultOrchestrationProcessorSpec extends Specification {
     1 * taskRepository.create(_, _, taskKey) >> task
     1 * atomicOperation.operate(_) >> { throw exception }
     task.status.isFailed()
-    task.status.retryable == retryable
+    task.status.isRetryable() == retryable
 
     //Tasks without SagaIds (i.e., not a saga) are not retryable
     where:
diff --git a/clouddriver-dcos/clouddriver-dcos.gradle b/clouddriver-dcos/clouddriver-dcos.gradle
index 33cc26ce08b..c407c0c8e76 100644
--- a/clouddriver-dcos/clouddriver-dcos.gradle
+++ b/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"
+  implementation "org.apache.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'
diff --git a/clouddriver-docker/clouddriver-docker.gradle b/clouddriver-docker/clouddriver-docker.gradle
index 1a2d197764e..dd38d1d9aa2 100644
--- a/clouddriver-docker/clouddriver-docker.gradle
+++ b/clouddriver-docker/clouddriver-docker.gradle
@@ -7,7 +7,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"
+  implementation "org.apache.groovy:groovy"
   implementation "com.google.guava:guava"
   implementation "com.netflix.spectator:spectator-api"
   implementation "com.squareup.okhttp:okhttp"
diff --git a/clouddriver-ecs/clouddriver-ecs.gradle b/clouddriver-ecs/clouddriver-ecs.gradle
index 2a6c8556f90..e4940996b75 100644
--- a/clouddriver-ecs/clouddriver-ecs.gradle
+++ b/clouddriver-ecs/clouddriver-ecs.gradle
@@ -40,7 +40,7 @@ dependencies {
   implementation "org.apache.commons:commons-lang3"
   implementation "org.apache.httpcomponents:httpclient"
   implementation "org.apache.httpcomponents:httpcore"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
   testImplementation "cglib:cglib-nodep"
@@ -56,9 +56,7 @@ dependencies {
   integrationImplementation "com.mysql:mysql-connector-j"
   integrationImplementation sourceSets.test.output
   integrationImplementation sourceSets.main.output
-  integrationImplementation ("io.rest-assured:rest-assured:4.0.0") {
-    exclude group: "org.codehaus.groovy", module: "groovy" // use kork's version
-  }
+  integrationImplementation "io.rest-assured:rest-assured"
 }
 
 task integrationTest(type: Test) {
diff --git a/clouddriver-elasticsearch/clouddriver-elasticsearch.gradle b/clouddriver-elasticsearch/clouddriver-elasticsearch.gradle
index f70a91bfe88..39450f54819 100644
--- a/clouddriver-elasticsearch/clouddriver-elasticsearch.gradle
+++ b/clouddriver-elasticsearch/clouddriver-elasticsearch.gradle
@@ -10,7 +10,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-retrofit"
   implementation "io.spinnaker.kork:kork-security"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.elasticsearch:elasticsearch"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
diff --git a/clouddriver-eureka/clouddriver-eureka.gradle b/clouddriver-eureka/clouddriver-eureka.gradle
index 5bbb24d2ef3..0c1e25c04a8 100644
--- a/clouddriver-eureka/clouddriver-eureka.gradle
+++ b/clouddriver-eureka/clouddriver-eureka.gradle
@@ -9,7 +9,7 @@ dependencies {
   implementation "com.amazonaws:aws-java-sdk"
   implementation "com.squareup.retrofit:converter-jackson"
   implementation "com.squareup.retrofit:retrofit"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
 
   testImplementation "cglib:cglib-nodep"
diff --git a/clouddriver-google-common/clouddriver-google-common.gradle b/clouddriver-google-common/clouddriver-google-common.gradle
index ddfe753ddbb..e94817df8aa 100644
--- a/clouddriver-google-common/clouddriver-google-common.gradle
+++ b/clouddriver-google-common/clouddriver-google-common.gradle
@@ -7,7 +7,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"
+  implementation "org.apache.groovy:groovy"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework.security:spring-security-config"
   implementation "org.springframework.security:spring-security-core"
diff --git a/clouddriver-google/clouddriver-google.gradle b/clouddriver-google/clouddriver-google.gradle
index 08930685009..85b5fd30202 100644
--- a/clouddriver-google/clouddriver-google.gradle
+++ b/clouddriver-google/clouddriver-google.gradle
@@ -7,8 +7,8 @@ dependencies {
   implementation project(":clouddriver-google-common")
   implementation project(":clouddriver-security")
 
-  implementation "org.codehaus.groovy:groovy"
-  implementation "org.codehaus.groovy:groovy-json"
+  implementation "org.apache.groovy:groovy"
+  implementation "org.apache.groovy:groovy-json"
   implementation "org.apache.commons:commons-lang3"
   implementation "com.google.apis:google-api-services-compute"
   implementation "com.google.guava:guava"
@@ -46,7 +46,7 @@ dependencies {
   testImplementation "org.spockframework:spock-spring"
   testImplementation "org.springframework:spring-test"
   testImplementation "org.springframework.boot:spring-boot-test"
-  testImplementation "org.codehaus.groovy:groovy-test"
+  testImplementation "org.apache.groovy:groovy-test"
 }
 
 configurations.all {
diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/AbstractEnableDisableAtomicOperation.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/AbstractEnableDisableAtomicOperation.groovy
index 6054ca0300c..fcc5014f458 100644
--- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/AbstractEnableDisableAtomicOperation.groovy
+++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/AbstractEnableDisableAtomicOperation.groovy
@@ -188,7 +188,7 @@ abstract class AbstractEnableDisableAtomicOperation extends GoogleAtomicOperatio
           getTargetPool(compute, project, region, targetPoolLocalName),
           "target pool",
           task,
-          RETRY_ERROR_CODES,
+          AbstractEnableDisableAtomicOperation.RETRY_ERROR_CODES,
           [],
           [operation: "getTargetPool", action: "destroy", phase: phaseName, (TAG_SCOPE): SCOPE_REGIONAL, (TAG_REGION): region],
           registry
@@ -206,7 +206,7 @@ abstract class AbstractEnableDisableAtomicOperation extends GoogleAtomicOperatio
             removeInstancesFromTargetPool(compute, project, region, targetPoolLocalName, targetPoolsRemoveInstanceRequest),
             "instances",
             task,
-            RETRY_ERROR_CODES,
+            AbstractEnableDisableAtomicOperation.RETRY_ERROR_CODES,
             [],
             [operation: "removeInstancesFromTargetPool", action: "deregister", phase: phaseName, (TAG_SCOPE): SCOPE_REGIONAL, (TAG_REGION): region],
             registry
@@ -351,7 +351,7 @@ abstract class AbstractEnableDisableAtomicOperation extends GoogleAtomicOperatio
             addInstancesToTargetPool(compute, project, region, targetPoolLocalName, targetPoolsAddInstanceRequest),
             "instances",
             task,
-            RETRY_ERROR_CODES,
+            AbstractEnableDisableAtomicOperation.RETRY_ERROR_CODES,
             [],
             [operation: "addInstancesToTargetPool", action: "register", phase: phaseName, (TAG_SCOPE): SCOPE_REGIONAL, (TAG_REGION): region],
             registry
diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.groovy
index a9cbd234248..2bc27dcb2fe 100644
--- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.groovy
+++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.groovy
@@ -165,6 +165,10 @@ class GoogleServerGroup implements GoogleLabeledResource {
       selectZones = googleServerGroup.selectZones
     }
 
+    Boolean isDisabled() {
+      disabled
+    }
+
     @Override
     Moniker getMoniker() {
       return NamerRegistry.lookup()
diff --git a/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/deploy/exception/GoogleOperationException.java b/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/deploy/exception/GoogleOperationException.java
index 68726a5c668..67d7d9a2e2b 100644
--- a/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/deploy/exception/GoogleOperationException.java
+++ b/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/deploy/exception/GoogleOperationException.java
@@ -16,6 +16,10 @@
 package com.netflix.spinnaker.clouddriver.google.deploy.exception;
 
 public class GoogleOperationException extends RuntimeException {
+  public GoogleOperationException() {
+    super();
+  }
+
   public GoogleOperationException(String message) {
     super(message);
   }
diff --git a/clouddriver-huaweicloud/clouddriver-huaweicloud.gradle b/clouddriver-huaweicloud/clouddriver-huaweicloud.gradle
index 63c90c8f74b..080d62c3aa4 100644
--- a/clouddriver-huaweicloud/clouddriver-huaweicloud.gradle
+++ b/clouddriver-huaweicloud/clouddriver-huaweicloud.gradle
@@ -17,7 +17,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"
+  implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation 'org.apache.commons:commons-lang3'
diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle
index c642a4c3e64..c5eb43ace49 100644
--- a/clouddriver-kubernetes/clouddriver-kubernetes.gradle
+++ b/clouddriver-kubernetes/clouddriver-kubernetes.gradle
@@ -56,7 +56,7 @@ dependencies {
   implementation project(":cats:cats-core")
   implementation project(":clouddriver-security")
 
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
 
   implementation "com.google.code.findbugs:jsr305"
   implementation "com.google.guava:guava"
@@ -99,7 +99,7 @@ dependencies {
   testImplementation "org.spockframework:spock-spring"
   testImplementation "org.springframework:spring-test"
   testImplementation "org.springframework.boot:spring-boot-test"
-  testImplementation "org.codehaus.groovy:groovy-templates"
+  testImplementation "org.apache.groovy:groovy-templates"
 
   integrationImplementation project(":clouddriver-web")
   integrationImplementation "org.springframework.boot:spring-boot-starter-test"
@@ -107,10 +107,7 @@ dependencies {
   integrationImplementation "org.testcontainers:mysql"
   integrationImplementation "org.testcontainers:junit-jupiter"
   integrationImplementation "com.mysql:mysql-connector-j"
-  integrationImplementation ("io.rest-assured:rest-assured:4.0.0") {
-    // Exclude groovy pulled in by rest-assured, so we use kork's version
-    exclude group: "org.codehaus.groovy", module: "groovy"
-  }
+  integrationImplementation "io.rest-assured:rest-assured"
   integrationImplementation "org.yaml:snakeyaml"
 }
 
diff --git a/clouddriver-lambda/clouddriver-lambda.gradle b/clouddriver-lambda/clouddriver-lambda.gradle
index 8d458995b16..c5710698ec2 100644
--- a/clouddriver-lambda/clouddriver-lambda.gradle
+++ b/clouddriver-lambda/clouddriver-lambda.gradle
@@ -17,7 +17,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"
+  implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "com.squareup.okhttp:okhttp"
   implementation "com.squareup.okhttp:okhttp-apache"
diff --git a/clouddriver-oracle/clouddriver-oracle.gradle b/clouddriver-oracle/clouddriver-oracle.gradle
index 2bdb84dadf6..02f8edfaf06 100644
--- a/clouddriver-oracle/clouddriver-oracle.gradle
+++ b/clouddriver-oracle/clouddriver-oracle.gradle
@@ -14,12 +14,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"
+  implementation "org.apache.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-console"
+  testImplementation "org.apache.groovy:groovy-console"
   testImplementation "org.objenesis:objenesis"
   testImplementation "org.spockframework:spock-core"
   testImplementation "org.spockframework:spock-spring"
diff --git a/clouddriver-oracle/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy b/clouddriver-oracle/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy
index d9cc03676bd..d939e65bc50 100644
--- a/clouddriver-oracle/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy
+++ b/clouddriver-oracle/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy
@@ -73,6 +73,10 @@ class OracleServerGroup {
         min: oracleServerGroup.targetSize, max: oracleServerGroup.targetSize)
     }
 
+    Boolean isDisabled(){
+      disabled
+    }
+
     @Override
     Long getCreatedTime() {
       launchConfig ? launchConfig.createdTime as Long : null
diff --git a/clouddriver-oracle/src/test/groovy/com/netflix/spinnaker/clouddriver/oracle/deploy/op/DestroyOracleServerGroupAtomicOperationSpec.groovy b/clouddriver-oracle/src/test/groovy/com/netflix/spinnaker/clouddriver/oracle/deploy/op/DestroyOracleServerGroupAtomicOperationSpec.groovy
index 15a216a0f34..f8d5b3769b0 100644
--- a/clouddriver-oracle/src/test/groovy/com/netflix/spinnaker/clouddriver/oracle/deploy/op/DestroyOracleServerGroupAtomicOperationSpec.groovy
+++ b/clouddriver-oracle/src/test/groovy/com/netflix/spinnaker/clouddriver/oracle/deploy/op/DestroyOracleServerGroupAtomicOperationSpec.groovy
@@ -21,7 +21,6 @@ import com.oracle.bmc.loadbalancer.model.*
 import com.oracle.bmc.loadbalancer.requests.UpdateBackendSetRequest
 import com.oracle.bmc.loadbalancer.responses.GetLoadBalancerResponse
 import com.oracle.bmc.loadbalancer.responses.UpdateBackendSetResponse
-import groovy.ui.SystemOutputInterceptor
 import spock.lang.Specification
 
 class DestroyOracleServerGroupAtomicOperationSpec extends Specification {
@@ -49,8 +48,8 @@ class DestroyOracleServerGroupAtomicOperationSpec extends Specification {
     1 * loadBalancerClient.getLoadBalancer(_) >> GetLoadBalancerResponse.builder().loadBalancer(
       LoadBalancer.builder().backendSets(['myBackendSet': BackendSet.builder().backends(
         backends.collect { Backend.builder().ipAddress(it).build() } ).build()]).build()).build()
-    1 * sgService.getServerGroup(_, _, "sg1") >> 
-      new OracleServerGroup(loadBalancerId: "ocid.lb.oc1..12345", backendSetName: 'myBackendSet', 
+    1 * sgService.getServerGroup(_, _, "sg1") >>
+      new OracleServerGroup(loadBalancerId: "ocid.lb.oc1..12345", backendSetName: 'myBackendSet',
         instances: srvGroup.collect {new OracleInstance(id: it, privateIp: it)} as Set)
     1 * sgService.destroyServerGroup(_, _, "sg1")
     1 * loadBalancerClient.updateBackendSet(_) >> { args ->
diff --git a/clouddriver-security/clouddriver-security.gradle b/clouddriver-security/clouddriver-security.gradle
index 9aa162bbb82..3b226a5e5e3 100644
--- a/clouddriver-security/clouddriver-security.gradle
+++ b/clouddriver-security/clouddriver-security.gradle
@@ -10,7 +10,7 @@ dependencies {
   implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "io.spinnaker.kork:kork-core"
   implementation "io.spinnaker.kork:kork-moniker"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.slf4j:jcl-over-slf4j"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "com.github.ben-manes.caffeine:guava"
diff --git a/clouddriver-titus/clouddriver-titus.gradle b/clouddriver-titus/clouddriver-titus.gradle
index 91f1547dacf..b567e6a99f5 100644
--- a/clouddriver-titus/clouddriver-titus.gradle
+++ b/clouddriver-titus/clouddriver-titus.gradle
@@ -33,8 +33,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"
-  implementation "org.codehaus.groovy:groovy-json"
+  implementation "org.apache.groovy:groovy"
+  implementation "org.apache.groovy:groovy-json"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
diff --git a/clouddriver-titus/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/model/TitusServerGroup.groovy b/clouddriver-titus/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/model/TitusServerGroup.groovy
index 555b42e810a..eb3cb684461 100644
--- a/clouddriver-titus/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/model/TitusServerGroup.groovy
+++ b/clouddriver-titus/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/model/TitusServerGroup.groovy
@@ -62,7 +62,7 @@ class TitusServerGroup implements ServerGroup, Serializable {
   DisruptionBudget disruptionBudget
   TitusServerGroupResources resources = new TitusServerGroupResources()
   TitusServerGroupPlacement placement = new TitusServerGroupPlacement()
-  boolean disabled
+  Boolean disabled
   Efs efs
   String capacityGroup
   int retries
diff --git a/clouddriver-web/clouddriver-web.gradle b/clouddriver-web/clouddriver-web.gradle
index ff8cb3a4ec6..0c42735e249 100644
--- a/clouddriver-web/clouddriver-web.gradle
+++ b/clouddriver-web/clouddriver-web.gradle
@@ -33,7 +33,7 @@ dependencies {
   implementation "commons-io:commons-io"
   implementation "io.reactivex:rxjava"
   implementation "io.swagger:swagger-annotations"
-  implementation "org.codehaus.groovy:groovy"
+  implementation "org.apache.groovy:groovy"
   implementation "org.slf4j:slf4j-api"
   implementation "org.springframework.boot:spring-boot-starter-actuator"
   implementation "org.springframework.boot:spring-boot-starter-json"
@@ -49,7 +49,7 @@ dependencies {
   testImplementation "org.springframework.boot:spring-boot-starter-test"
   testImplementation "org.spockframework:spock-core"
   testImplementation "io.kubernetes:client-java-api-fluent:13.0.2"
-  testImplementation "org.codehaus.groovy:groovy-json"
+  testImplementation "org.apache.groovy:groovy-json"
 
   // Add each included cloud provider project as a runtime dependency
   gradle.includedCloudProviderProjects.each {
diff --git a/clouddriver-yandex/clouddriver-yandex.gradle b/clouddriver-yandex/clouddriver-yandex.gradle
index b797faae250..107c8ce4a34 100644
--- a/clouddriver-yandex/clouddriver-yandex.gradle
+++ b/clouddriver-yandex/clouddriver-yandex.gradle
@@ -16,7 +16,7 @@ dependencies {
   }
   compileOnly "io.opencensus:opencensus-api"
   compileOnly "io.opencensus:opencensus-contrib-grpc-metrics"
-  implementation "org.codehaus.groovy:groovy-datetime"
+  implementation "org.apache.groovy:groovy-datetime"
   implementation "org.apache.commons:commons-lang3"
   implementation "com.netflix.frigga:frigga"
   implementation "com.netflix.spectator:spectator-api"