chore(dependencies): Autobump korkVersion (#1180)

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

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...c/main/java/com/netflix/spinnaker/fiat/roles/google/GoogleDirectoryUserRolesProvider.java b/...c/main/java/com/netflix/spinnaker/fiat/roles/google/GoogleDirectoryUserRolesProvider.java
@@ -26,12 +26,12 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.ExponentialBackOff;
-import com.google.api.services.admin.directory.Directory;
-import com.google.api.services.admin.directory.DirectoryScopes;
-import com.google.api.services.admin.directory.model.Group;
-import com.google.api.services.admin.directory.model.Groups;
+import com.google.api.services.directory.Directory;
+import com.google.api.services.directory.DirectoryScopes;
+import com.google.api.services.directory.model.Group;
+import com.google.api.services.directory.model.Groups;
 import com.netflix.spinnaker.fiat.model.resources.Role;
 import com.netflix.spinnaker.fiat.permissions.ExternalUser;
 import com.netflix.spinnaker.fiat.roles.UserRolesProvider;
@@ -225,7 +225,7 @@ private GoogleCredential getGoogleCredential() {
 
   private Directory getDirectoryService() {
     HttpTransport httpTransport = new NetHttpTransport();
-    JacksonFactory jacksonFactory = new JacksonFactory();
+    GsonFactory jacksonFactory = new GsonFactory();
     GoogleCredential credential = getGoogleCredential();
 
     PropertyAccessor accessor = PropertyAccessorFactory.forDirectFieldAccess(credential);

diff --git a/...roovy/com/netflix/spinnaker/fiat/roles/google/GoogleDirectoryUserRolesProviderSpec.groovy b/...roovy/com/netflix/spinnaker/fiat/roles/google/GoogleDirectoryUserRolesProviderSpec.groovy
@@ -1,8 +1,8 @@
 package com.netflix.spinnaker.fiat.roles.google
 
 import com.netflix.spinnaker.fiat.permissions.ExternalUser
-import com.google.api.services.admin.directory.model.Group;
-import com.google.api.services.admin.directory.model.Groups;
+import com.google.api.services.directory.model.Group;
+import com.google.api.services.directory.model.Groups;
 import spock.lang.Specification
 
 class GoogleDirectoryUserRolesProviderSpec extends Specification {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 includeProviders=file,github,google-groups,ldap
-korkVersion=7.239.0
+korkVersion=7.240.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
 targetJava17=false