From d9f6d5236921f300d0afbea828bd548095c9e2cc Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Tue, 17 Oct 2023 19:10:42 -0400 Subject: [PATCH] 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 Co-authored-by: j-sandy <30489233+j-sandy@users.noreply.github.com> --- build.gradle | 1 - cats/cats-test/cats-test.gradle | 2 +- .../clouddriver/appengine/model/AppengineServerGroup.groovy | 5 ----- .../clouddriver/aws/deploy/asg/SimpleServerGroup.groovy | 5 ----- .../aws/deploy/ops/discovery/DiscoverySupportUnitSpec.groovy | 1 - .../spinnaker/clouddriver/model/SimpleServerGroup.groovy | 5 ----- .../clouddriver/google/model/GoogleServerGroup.groovy | 5 ----- .../clouddriver/oracle/model/OracleServerGroup.groovy | 5 ----- gradle.properties | 2 +- 9 files changed, 2 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index c91352a574b..c3f8acc0f31 100644 --- 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 index ab83d105177..299df4a1294 100644 --- 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/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 4dc4214728d..90f24e649c8 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 @@ -168,11 +168,6 @@ class AppengineServerGroup implements ServerGroup, Serializable { null } - @Override - Boolean isDisabled() { - disabled - } - enum ServingStatus { SERVING, STOPPED, 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 8a62e768795..573a5ba91b7 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,9 +36,4 @@ class SimpleServerGroup implements ServerGroup { ServerGroup.Capacity capacity ServerGroup.ImageSummary imageSummary ServerGroup.ImagesSummary imagesSummary - - @Override - Boolean isDisabled() { - return 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 6e77ea79536..b1e24749ca8 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 @@ -570,7 +570,6 @@ class DiscoverySupportUnitSpec extends Specification { Map launchConfig ServerGroup.InstanceCounts instanceCounts ServerGroup.Capacity capacity - Boolean isDisabled() {disabled} ServerGroup.ImageSummary getImageSummary() {} ServerGroup.ImagesSummary getImagesSummary() {} } 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 97cb6a0a3fa..1171b46eda8 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,9 +33,4 @@ class SimpleServerGroup implements ServerGroup { Capacity capacity ImagesSummary imagesSummary ImageSummary imageSummary - - @Override - Boolean isDisabled() { - return disabled - } } 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 cda38544e5a..020ff26ca49 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 @@ -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/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 c5a8ea3d7b4..d9cc03676bd 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,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 index 2393324b10c..8ed6ad6f637 100644 --- 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