Merge branch 'master' into BOB-31045-update_aws_sdk_and_cli

.github/workflows/build.yml

@@ -15,8 +15,8 @@ jobs:
     if: startsWith(github.repository, 'spinnaker/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'zulu'

.github/workflows/gradle-wrapper-validation.yml

@@ -6,5 +6,5 @@ jobs:
     name: "Gradle wrapper validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2

.github/workflows/pr.yml

@@ -9,8 +9,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'zulu'

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow
       # Given a tag, determine what branch we are on, so we can bump dependencies in the correct branch
       - name: Get Branch
@@ -35,7 +35,7 @@ jobs:
           fi
           echo "exactly one branch ($BRANCHES)"
           echo BRANCH=$BRANCHES >> $GITHUB_ENV
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'zulu'
@@ -74,7 +74,7 @@ jobs:
       - name: Pause before dependency bump
         run: sleep 600
       - name: Trigger dependency bump workflow
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.SPINNAKER_GITHUB_TOKEN }}
           event-type: bump-dependencies

build.gradle

@@ -31,14 +31,12 @@ subprojects {
   if (it.name != "kork-bom" && it.name != "spinnaker-dependencies") {
     apply plugin: 'java-library'
     test {
-      useJUnitPlatform {
-        includeEngines "spek2", "junit-vintage", "junit-jupiter"
-      }
+      useJUnitPlatform()
     }
     dependencies {
       annotationProcessor(platform(project(":spinnaker-dependencies")))
       annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-      testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+      testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
     }
   }
 }

gradle.properties

@@ -1,5 +1,5 @@
-kotlinVersion=1.4.32
+kotlinVersion=1.5.32
 org.gradle.parallel=true
-spinnakerGradleVersion=8.26.0
+spinnakerGradleVersion=8.32.1
 targetJava11=true
 includeRuntimes=actuator,core,eureka,retrofit,secrets-aws,secrets-gcp,stackdriver,swagger,tomcat,web

gradle/kotlin-test.gradle

@@ -20,6 +20,7 @@
 apply plugin: "kotlin"
 
 dependencies {
+  testImplementation(platform(project(":spinnaker-dependencies")))
   testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
 
   testImplementation "org.junit.jupiter:junit-jupiter-api"
@@ -29,13 +30,14 @@ dependencies {
   testImplementation "dev.minutest:minutest"
   testImplementation "io.mockk:mockk"
 
+  testRuntimeOnly(platform(project(":spinnaker-dependencies")))
   testRuntimeOnly "org.junit.platform:junit-platform-launcher"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }
 
 compileTestKotlin {
   kotlinOptions {
-    languageVersion = "1.4"
+    languageVersion = "1.5"
     jvmTarget = "11"
   }
 }

gradle/kotlin.gradle

@@ -19,6 +19,7 @@ apply plugin: "kotlin-spring"
 apply plugin: "io.gitlab.arturbosch.detekt"
 
 dependencies {
+  testImplementation(platform(project(":spinnaker-dependencies")))
   testImplementation "org.junit.jupiter:junit-jupiter-api"
   testImplementation "org.junit.platform:junit-platform-runner"
   testImplementation "org.spekframework.spek2:spek-dsl-jvm"
@@ -28,6 +29,7 @@ dependencies {
   testImplementation "dev.minutest:minutest"
   testImplementation "io.mockk:mockk"
 
+  testRuntimeOnly(platform(project(":spinnaker-dependencies")))
   testRuntimeOnly "org.junit.platform:junit-platform-launcher"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
@@ -37,14 +39,14 @@ dependencies {
 
 compileKotlin {
   kotlinOptions {
-    languageVersion = "1.4"
+    languageVersion = "1.5"
     jvmTarget = "11"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
-    languageVersion = "1.4"
+    languageVersion = "1.5"
     jvmTarget = "11"
   }
 }

gradle/lombok.gradle

@@ -1,8 +1,10 @@
 dependencies {
   compileOnly "org.projectlombok:lombok"
+  compileOnly(platform(project(":spinnaker-dependencies")))
   annotationProcessor "org.projectlombok:lombok"
   annotationProcessor(platform(project(":spinnaker-dependencies")))
   testCompileOnly "org.projectlombok:lombok"
+  testCompileOnly(platform(project(":spinnaker-dependencies")))
   testAnnotationProcessor(platform(project(":spinnaker-dependencies")))
   testAnnotationProcessor "org.projectlombok:lombok"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists