chore(dependencies): Autobump korkVersion (#6082)

* chore(dependencies): Autobump korkVersion * refactor(appengine): remove isDisabled() method with groovy 3 upgrade While upgrading groovy 3.0.10 and spockframework 2.0-groovy-3.0, encounter below error in clouddriver-appengine module as groovy 3 is smart enough to create implicit getter with name isDisabled() for `disabled` boolean property. ``` /clouddriver/clouddriver-appengine/build/tmp/compileGroovy/groovy-java-stubs/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.java:65: error: method isDisabled() is already defined in class AppengineServerGroup @java.lang.Override() public java.lang.Boolean isDisabled() { return (java.lang.Boolean)null;} ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: /clouddriver/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/config/AppengineCredentialsConfiguration.java uses unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 1 error startup failed: Compilation failed; see the compiler error output for details. 1 error > Task :clouddriver-appengine:compileGroovy FAILED ``` To fix this issue removed `isDisabled()` method. * refactor(oracle): remove isDisabled() method with groovy 3 upgrade While upgrading groovy 3.0.10 and spockframework 2.0-groovy-3.0, encounter below error in clouddriver-oracle module as groovy 3 is smart enough to create implicit getter with name isDisabled() for `disabled` boolean property. ``` startup failed: /clouddriver/clouddriver-oracle/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy: 76: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.oracle.model.OracleServerGroup$View'. @ line 76, column 5. @OverRide ^ /clouddriver/clouddriver-oracle/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy: -1: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.oracle.model.OracleServerGroup$View'. @ line -1, column -1. 2 errors > Task :clouddriver-oracle:compileGroovy FAILED ``` To fix this issue removed `isDisabled()` method. * refactor(core/test): remove isDisabled() method with groovy 3 upgrade While upgrading groovy 3.0.10 and spockframework 2.0-groovy-3.0, encounter below error in clouddriver-core module as groovy 3 is smart enough to create implicit getter with name isDisabled() for `disabled` boolean property. ``` > Task :clouddriver-core:compileTestGroovy FAILED startup failed: /clouddriver/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy: 37: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.model.SimpleServerGroup'. @ line 37, column 3. @OverRide ^ /clouddriver/clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy: -1: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.model.SimpleServerGroup'. @ line -1, column -1. 2 errors ``` To fix this issue removed `isDisabled()` method. * refactor(google): remove isDisabled() method with groovy 3 upgrade While upgrading groovy 3.0.10 and spockframework 2.0-groovy-3.0, encounter below error in clouddriver-google module as groovy 3 is smart enough to create implicit getter with name isDisabled() for `disabled` boolean property. ``` /clouddriver/clouddriver-google/build/tmp/compileGroovy/groovy-java-stubs/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.java:167: error: method isDisabled() is already defined in class GoogleServerGroup.View @java.lang.Override() public java.lang.Boolean isDisabled() { return (java.lang.Boolean)null;} ``` To fix this issue removed `isDisabled()` method. * refactor(aws/test): remove isDisabled() method with groovy 3 upgrade While upgrading groovy 3.0.10 and spockframework 2.0-groovy-3.0, encounter below error in clouddriver-aws module as groovy 3 is smart enough to create implicit getter with name isDisabled() for `disabled` boolean property. ``` startup failed: /clouddriver/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy: 40: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.aws.deploy.asg.SimpleServerGroup'. @ line 40, column 3. @OverRide ^ /clouddriver/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy: -1: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.aws.deploy.asg.SimpleServerGroup'. @ line -1, column -1. 2 errors > Task :clouddriver-aws:compileTestGroovy FAILED ``` ``` startup failed: /clouddriver/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy: 573: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.aws.deploy.ops.discovery.DiscoverySupportUnitSpec$DefaultServerGroup'. @ line 573, column 5. Boolean isDisabled() {disabled} ^ /clouddriver/clouddriver-aws/src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy: -1: Repetitive method name/signature for method 'java.lang.Boolean isDisabled()' in class 'com.netflix.spinnaker.clouddriver.aws.deploy.ops.discovery.DiscoverySupportUnitSpec$DefaultServerGroup'. @ line -1, column -1. 2 errors > Task :clouddriver-aws:compileTestGroovy FAILED ``` To fix this issue removed `isDisabled()` method. * refactor(test): add runtime jupiter engine and remove vintage engine with upgrade of groovy 3 --------- Co-authored-by: root <root@0c89bc74b80c> Co-authored-by: j-sandy <30489233+j-sandy@users.noreply.github.com>
spinnaker · Oct 17, 2023 · d9f6d52 · d9f6d52
1 parent 29d5f1c
commit d9f6d52
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -63,7 +63,6 @@ subprojects {
       testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
       testAnnotationProcessor "org.projectlombok:lombok"
       testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
-      testRuntimeOnly "org.junit.vintage:junit-vintage-engine" // Required for Spock tests to execute along with Junit5 tests.
     }
 
     test {

diff --git a/cats/cats-test/cats-test.gradle b/cats/cats-test/cats-test.gradle
@@ -14,7 +14,7 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok"
   testAnnotationProcessor "org.projectlombok:lombok"
 
-  testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
+  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }
 test{
   useJUnitPlatform()

diff --git a/...main/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.groovy b/...main/groovy/com/netflix/spinnaker/clouddriver/appengine/model/AppengineServerGroup.groovy
@@ -168,11 +168,6 @@ class AppengineServerGroup implements ServerGroup, Serializable {
     null
   }
 
-  @Override
-  Boolean isDisabled() {
-    disabled
-  }
-
   enum ServingStatus {
     SERVING,
     STOPPED,

diff --git a/...src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy b/...src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/asg/SimpleServerGroup.groovy
@@ -36,9 +36,4 @@ class SimpleServerGroup implements ServerGroup {
   ServerGroup.Capacity capacity
   ServerGroup.ImageSummary imageSummary
   ServerGroup.ImagesSummary imagesSummary
-
-  @Override
-  Boolean isDisabled() {
-    return disabled
-  }
 }
diff --git a/...om/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy b/...om/netflix/spinnaker/clouddriver/aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy
@@ -570,7 +570,6 @@ class DiscoverySupportUnitSpec extends Specification {
     Map<String, Object> launchConfig
     ServerGroup.InstanceCounts instanceCounts
     ServerGroup.Capacity capacity
-    Boolean isDisabled() {disabled}
     ServerGroup.ImageSummary getImageSummary() {}
     ServerGroup.ImagesSummary getImagesSummary() {}
   }

diff --git a/...ver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy b/...ver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/model/SimpleServerGroup.groovy
@@ -33,9 +33,4 @@ class SimpleServerGroup implements ServerGroup {
   Capacity capacity
   ImagesSummary imagesSummary
   ImageSummary imageSummary
-
-  @Override
-  Boolean isDisabled() {
-    return disabled
-  }
 }
diff --git a/...e/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.groovy b/...e/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleServerGroup.groovy
@@ -142,11 +142,6 @@ class GoogleServerGroup implements GoogleLabeledResource {
         .deriveMoniker(GoogleServerGroup.this)
     }
 
-    @Override
-    Boolean isDisabled() { // Because groovy isn't smart enough to generate this method :-(
-      disabled
-    }
-
     @Override
     Long getCreatedTime() {
       launchConfig ? launchConfig.createdTime as Long : null

diff --git a/...e/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy b/...e/src/main/groovy/com/netflix/spinnaker/clouddriver/oracle/model/OracleServerGroup.groovy
@@ -73,11 +73,6 @@ class OracleServerGroup {
         min: oracleServerGroup.targetSize, max: oracleServerGroup.targetSize)
     }
 
-    @Override
-    Boolean isDisabled() { // Because groovy isn't smart enough to generate this method :-(
-      disabled
-    }
-
     @Override
     Long getCreatedTime() {
       launchConfig ? launchConfig.createdTime as Long : null

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.42.0
-korkVersion=7.193.0
+korkVersion=7.194.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.31.0
 targetJava11=true