chore(dependencies): Autobump korkVersion (#2186)

* chore(dependencies): Autobump korkVersion * refactor(dependency): replace JacksonFactory to GsonFactory --------- Co-authored-by: root <root@0e8a9747aac9> Co-authored-by: Edgar Garcia <[email protected]>
spinnaker · Sep 26, 2024 · e7bec0a · e7bec0a
1 parent ba0742c
commit e7bec0a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-korkVersion=7.239.0
+korkVersion=7.240.0
 clouddriverVersion=5.89.0
 fiatVersion=1.50.0
 front50Version=2.35.0

diff --git a/...rd-backup/src/main/java/com/netflix/spinnaker/halyard/backup/kms/v1/google/GoogleKms.java b/...rd-backup/src/main/java/com/netflix/spinnaker/halyard/backup/kms/v1/google/GoogleKms.java
@@ -22,7 +22,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 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.cloudkms.v1.CloudKMS;
 import com.google.api.services.cloudkms.v1.CloudKMSScopes;
 import com.google.api.services.cloudkms.v1.model.*;
@@ -101,7 +101,7 @@ byte[] encryptContents(String plaintext) {
 
   private CloudKMS buildCredentials(GoogleSecureStorageProperties properties) {
     HttpTransport transport = new NetHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
     try {
       credentials = loadKmsCredential(properties.getJsonPath());
     } catch (IOException e) {

diff --git a/...ackup/src/main/java/com/netflix/spinnaker/halyard/backup/kms/v1/google/GoogleStorage.java b/...ackup/src/main/java/com/netflix/spinnaker/halyard/backup/kms/v1/google/GoogleStorage.java
@@ -23,7 +23,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 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.api.services.storage.StorageScopes;
 import com.google.api.services.storage.model.Bucket;
@@ -73,7 +73,7 @@ void writeBytes(String name, byte[] contents) {
 
   private Storage buildCredentials(GoogleSecureStorageProperties properties) {
     HttpTransport transport = new NetHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
     GoogleCredentials credentials;
     try {
       credentials = loadStorageCredential(properties.getJsonPath());

diff --git a/...c/main/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleProfileReaderConfig.java b/...c/main/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleProfileReaderConfig.java
@@ -20,7 +20,7 @@
 
 import com.google.api.client.http.HttpRequestInitializer;
 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.api.services.storage.StorageScopes;
 import com.netflix.spinnaker.halyard.core.provider.v1.google.GoogleCredentials;
@@ -45,7 +45,7 @@ public Storage unauthenticatedGoogleStorage() {
   }
 
   private Storage createGoogleStorage(boolean useApplicationDefaultCreds) {
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+    JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
     String applicationName = "Spinnaker/Halyard";
     HttpRequestInitializer requestInitializer = null;
 

diff --git a/...n/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleWriteableProfileRegistry.java b/...n/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleWriteableProfileRegistry.java
@@ -20,7 +20,7 @@
 import com.google.api.client.http.ByteArrayContent;
 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.api.services.storage.StorageScopes;
 import com.google.api.services.storage.model.StorageObject;
@@ -45,7 +45,7 @@ public class GoogleWriteableProfileRegistry {
 
   GoogleWriteableProfileRegistry(WriteableProfileRegistryProperties properties) {
     HttpTransport httpTransport = GoogleCredentials.buildHttpTransport();
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+    JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
     com.google.auth.oauth2.GoogleCredentials credentials;
     try {
       credentials = loadCredentials(properties.getJsonPath());