Merge branch 'master' into opendocsUpgrade

kork-artifacts/src/main/java/com/netflix/spinnaker/kork/artifacts/artifactstore/s3/S3ArtifactStoreStorer.java

@@ -59,7 +59,9 @@ public S3ArtifactStoreStorer(
     this.bucket = bucket;
     this.uriBuilder = uriBuilder;
     this.applicationsPattern =
-        (applicationsRegex != null) ? Pattern.compile(applicationsRegex) : null;
+        (applicationsRegex != null)
+            ? Pattern.compile(applicationsRegex, Pattern.CASE_INSENSITIVE)
+            : null;
   }
 
   /**

kork-artifacts/src/test/java/com/netflix/spinnaker/kork/artifacts/artifactstore/s3/S3ArtifactStoreStorerTest.java

@@ -99,6 +99,8 @@ private static Stream<Arguments> applicationsRegexArgs() {
         Arguments.of("any", null, true),
         Arguments.of("app-one", allowRegex, true),
         Arguments.of("app-four", allowRegex, false),
+        Arguments.of("APP-One", allowRegex, true),
+        Arguments.of("APP-FOUR", allowRegex, false),
         Arguments.of("one", allowRegex, false),
         Arguments.of("app-one-more", allowRegex, false),
         Arguments.of("app-five", allowRegex, true),

kork-aws/kork-aws.gradle

@@ -24,7 +24,7 @@ dependencies {
   api "com.amazonaws:aws-java-sdk-core"
   api "com.amazonaws:aws-java-sdk-sns"
   api "com.amazonaws:aws-java-sdk-sqs"
-  api "org.codehaus.groovy:groovy"
+  api "org.apache.groovy:groovy"
   api "com.hubspot.jinjava:jinjava"
   api "com.jcraft:jsch.agentproxy.jsch"
   api "com.jcraft:jsch.agentproxy.connector-factory"

kork-core-tck/kork-core-tck.gradle

@@ -7,6 +7,6 @@ dependencies {
   implementation(project(":kork-core"))
   implementation(project(":kork-exceptions"))
 
-  implementation("org.codehaus.groovy:groovy")
+  implementation("org.apache.groovy:groovy")
   implementation("org.spockframework:spock-core")
 }

kork-secrets-gcp/src/main/java/com/netflix/spinnaker/kork/secrets/engines/GcsSecretEngine.java

@@ -19,7 +19,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.netflix.spinnaker.kork.secrets.EncryptedSecret;
@@ -82,7 +82,7 @@ private Storage getStorage() throws IOException {
 
     if (storage == null) {
       HttpTransport httpTransport = GoogleUtils.buildHttpTransport();
-      JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+      JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
       GoogleCredentials credentials = GoogleUtils.buildGoogleCredentials();
       HttpRequestInitializer requestInitializer =
           GoogleUtils.setTimeoutsAndRetryBehavior(credentials);

kork-stackdriver/src/main/java/com/netflix/spectator/stackdriver/ConfigParams.java

@@ -20,7 +20,7 @@
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.monitoring.v3.Monitoring;
 import com.google.api.services.monitoring.v3.MonitoringScopes;
 import com.netflix.spectator.api.Measurement;
@@ -106,7 +106,7 @@ public ConfigParams build() {
       if (result.monitoring == null) {
         try {
           HttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
-          JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+          JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
           GoogleCredential credential = loadCredential(transport, jsonFactory, credentialsPath);
           String version = getClass().getPackage().getImplementationVersion();
           if (version == null) {

kork-web/kork-web.gradle

@@ -16,7 +16,7 @@ dependencies {
   api project(":kork-crypto")
   api project(":kork-security")
   api project(":kork-exceptions")
-  api "org.codehaus.groovy:groovy"
+  api "org.apache.groovy:groovy"
   api "org.springframework.boot:spring-boot-starter-web"
   api "org.springframework.boot:spring-boot-starter-webflux"
   api "org.springframework.boot:spring-boot-starter-security"

spinnaker-dependencies/spinnaker-dependencies.gradle

@@ -12,6 +12,7 @@ ext {
     bouncycastle     : "1.77",
     brave            : "5.12.3",
     gcp              : "25.3.0",
+    groovy           : "4.0.15",
     jsch             : "0.1.54",
     jschAgentProxy   : "0.0.9",
     // spring boot 2.7.18 specifies logback 1.2.12.  Pin to 1.2.13 to resolve
@@ -55,14 +56,17 @@ dependencies {
   api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion"))
   api(platform("org.junit:junit-bom:5.9.0")) // untill spring boot >= 3.0.0
   api(platform("io.zipkin.brave:brave-bom:${versions.brave}"))
-  api(platform("org.springframework.boot:spring-boot-dependencies:${versions.springBoot}"))
+  api(platform("org.apache.groovy:groovy-bom:${versions.groovy}")) // until upgrade of spring boot >= 3.0.13
+  api(platform("org.springframework.boot:spring-boot-dependencies:${versions.springBoot}")) {
+    exclude group: "org.codehaus.groovy", module: "*" // until upgrade of spring boot >= 3.0.13
+  }
   api(platform("com.amazonaws:aws-java-sdk-bom:${versions.aws}"))
   api(platform("com.google.protobuf:protobuf-bom:${versions.protobuf}"))
   api(platform("com.google.cloud:libraries-bom:${versions.gcp}"))
   api(platform("software.amazon.awssdk:bom:${versions.awsv2}"))
   api(platform("org.springframework.cloud:spring-cloud-dependencies:${versions.springCloud}"))
   api(platform("io.strikt:strikt-bom:0.31.0"))
-  api(platform("org.spockframework:spock-bom:2.2-groovy-3.0"))
+  api(platform("org.spockframework:spock-bom:2.2-groovy-4.0"))
   api(platform("com.oracle.oci.sdk:oci-java-sdk-bom:3.21.0"))
   api(platform("org.testcontainers:testcontainers-bom:1.19.8"))
   api(platform("io.arrow-kt:arrow-stack:${versions.arrow}"))
@@ -78,14 +82,26 @@ dependencies {
     api("ch.qos.logback:logback-access:${versions.logback}") {
        force = true
     }
+    api("io.rest-assured:xml-path:${versions.restassured}") {
+      force = true
+    }
+    api("io.rest-assured:json-path:${versions.restassured}") {
+      force = true
+    }
+    api("io.rest-assured:rest-assured:${versions.restassured}") {
+      force = true
+    }
+    api("io.rest-assured:rest-assured-common:${versions.restassured}") {
+      force = true
+    }
     api("com.amazonaws:aws-java-sdk:${versions.aws}")
-    api("com.google.api-client:google-api-client:1.30.10") // TODO: Track update for CVE-2020-7692, reanalysis pending.
-    api("com.google.apis:google-api-services-admin-directory:directory_v1-rev105-1.25.0")
-    api("com.google.apis:google-api-services-cloudbuild:v1-rev836-1.25.0")
-    api("com.google.apis:google-api-services-compute:beta-rev20201102-1.30.10")
-    api("com.google.apis:google-api-services-iam:v1-rev267-1.25.0")
-    api("com.google.apis:google-api-services-monitoring:v3-rev477-1.25.0")
-    api("com.google.apis:google-api-services-storage:v1-rev141-1.25.0")
+    api("com.google.api-client:google-api-client:1.33.0") // TODO: Track update for CVE-2020-7692, reanalysis pending.
+    api("com.google.apis:google-api-services-admin-directory:directory_v1-rev20220125-1.32.1")
+    api("com.google.apis:google-api-services-cloudbuild:v1-rev20211230-1.32.1")
+    api("com.google.apis:google-api-services-compute:beta-rev20211228-1.32.1")
+    api("com.google.apis:google-api-services-iam:v1-rev20220105-1.32.1")
+    api("com.google.apis:google-api-services-monitoring:v3-rev20220117-1.32.1") //v3-rev20210618-1.31.5
+    api("com.google.apis:google-api-services-storage:v1-rev20220210-1.32.1")
     api("com.google.cloud:google-cloud-secretmanager:2.3.10")
     api("com.google.code.findbugs:jsr305:3.0.2")
     api("com.google.guava:guava:33.0.0-jre")