diff --git a/gradle.properties b/gradle.properties index a62d463ff..73ff85d4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1.50.0 -korkVersion=7.239.0 +korkVersion=7.240.0 org.gradle.parallel=true spinnakerGradleVersion=8.32.1 targetJava17=false diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/CloudBuildFactory.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/CloudBuildFactory.java index c6544582c..e38c379a2 100644 --- a/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/CloudBuildFactory.java +++ b/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/CloudBuildFactory.java @@ -20,7 +20,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.cloudbuild.v1.CloudBuild; import com.google.api.services.storage.Storage; import com.google.auth.http.HttpCredentialsAdapter; @@ -38,7 +38,7 @@ final class CloudBuildFactory { private final int connectTimeoutSec = 10; private final int readTimeoutSec = 10; - private final JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); + private final JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); private final HttpTransport httpTransport; // Override the base URL for all requests to the cloud build API; primarily for testing. diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/GoogleCloudBuildParser.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/GoogleCloudBuildParser.java index 9dc712941..3d230c51a 100644 --- a/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/GoogleCloudBuildParser.java +++ b/igor-web/src/main/java/com/netflix/spinnaker/igor/gcb/GoogleCloudBuildParser.java @@ -17,7 +17,7 @@ package com.netflix.spinnaker.igor.gcb; import com.google.api.client.json.JsonGenerator; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; @@ -34,11 +34,11 @@ @Component @ConditionalOnProperty("gcb.enabled") final class GoogleCloudBuildParser { - private final JacksonFactory jacksonFactory = JacksonFactory.getDefaultInstance(); + private final GsonFactory gsonFactory = GsonFactory.getDefaultInstance(); T parse(String input, Class destinationClass) { try { - return jacksonFactory.createJsonParser(input).parse(destinationClass); + return gsonFactory.createJsonParser(input).parse(destinationClass); } catch (IOException e) { throw new UncheckedIOException(e); } @@ -51,7 +51,7 @@ T convert(Object input, Class destinationClass) { String serialize(Object input) { Writer writer = new StringWriter(); - try (JsonGenerator generator = jacksonFactory.createJsonGenerator(writer)) { + try (JsonGenerator generator = gsonFactory.createJsonGenerator(writer)) { generator.serialize(input); } catch (IOException e) { throw new UncheckedIOException(e);