Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(dependencies): Autobump korkVersion #2186

Merged
merged 2 commits into from
Sep 26, 2024
Merged

chore(dependencies): Autobump korkVersion #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
158df6b
chore(dependencies): Autobump korkVersion
Sep 26, 2024
a73f88b
refactor(dependency): replace JacksonFactory to GsonFactory
edgarulg Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
korkVersion=7.239.0
korkVersion=7.240.0
clouddriverVersion=5.89.0
fiatVersion=1.50.0
front50Version=2.35.0
Expand Down
4 changes: 2 additions & 2 deletions ...rd-backup/src/main/java/com/netflix/spinnaker/halyard/backup/kms/v1/google/GoogleKms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ...ackup/src/main/java/com/netflix/spinnaker/halyard/backup/kms/v1/google/GoogleStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleProfileReaderConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleWriteableProfileRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
Expand Down