From bebde406d2dff555db9508d603b4c069774e9ca9 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 15 Nov 2024 22:49:53 +0000 Subject: [PATCH 1/2] chore(dependencies): Autobump korkVersion --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7c6e82de4..fd5adde5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.243.0 +korkVersion=7.244.0 clouddriverVersion=5.89.0 fiatVersion=1.50.0 front50Version=2.35.0 From 2ae1d03a025f06edc59453e81bcb79cef950c135 Mon Sep 17 00:00:00 2001 From: David Byron Date: Fri, 15 Nov 2024 15:12:05 -0800 Subject: [PATCH 2/2] chore(deploy): use okhttp3 instead of okhttp (2.x) since kork no longer uses okhttp 2.x --- halyard-deploy/halyard-deploy.gradle | 2 +- .../halyard/deploy/spinnaker/v1/service/ClouddriverService.java | 2 +- .../halyard/deploy/spinnaker/v1/service/VaultServerService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/halyard-deploy/halyard-deploy.gradle b/halyard-deploy/halyard-deploy.gradle index 64a587e32..a6de3c0f6 100644 --- a/halyard-deploy/halyard-deploy.gradle +++ b/halyard-deploy/halyard-deploy.gradle @@ -18,7 +18,7 @@ dependencies { implementation 'org.apache.commons:commons-lang3' implementation 'commons-io:commons-io' implementation 'com.squareup.retrofit:retrofit' - implementation 'com.squareup.okhttp:okhttp' + implementation 'com.squareup.okhttp3:okhttp' implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0" implementation 'io.fabric8:kubernetes-client' diff --git a/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/ClouddriverService.java b/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/ClouddriverService.java index f61325b54..c9b112932 100644 --- a/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/ClouddriverService.java +++ b/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/ClouddriverService.java @@ -24,7 +24,6 @@ import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.AwsCredentialsProfileFactoryBuilder; import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.ClouddriverProfileFactory; import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.Profile; -import com.squareup.okhttp.Response; import java.nio.file.Paths; import java.util.HashMap; import java.util.List; @@ -32,6 +31,7 @@ import java.util.Optional; import lombok.Data; import lombok.EqualsAndHashCode; +import okhttp3.Response; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/VaultServerService.java b/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/VaultServerService.java index 188c01233..8e4673f70 100644 --- a/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/VaultServerService.java +++ b/halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/VaultServerService.java @@ -28,7 +28,6 @@ import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.profile.Profile; import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.distributed.VaultConfigMount; import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.distributed.VaultConfigMountSet; -import com.squareup.okhttp.Response; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -36,6 +35,7 @@ import java.util.*; import lombok.Data; import lombok.EqualsAndHashCode; +import okhttp3.Response; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component;