From 4575f6557eaf46d86436bfd307deef9ebe862660 Mon Sep 17 00:00:00 2001
From: spinnakerbot <spinbot@spinnaker.io>
Date: Fri, 15 Nov 2024 18:23:45 -0500
Subject: [PATCH] chore(dependencies): Autobump korkVersion (#2192)

* chore(dependencies): Autobump korkVersion

* chore(deploy): use okhttp3 instead of okhttp (2.x)

since kork no longer uses okhttp 2.x

---------

Co-authored-by: root <root@f15c9eb9818b>
Co-authored-by: David Byron <dbyron@salesforce.com>
---
 gradle.properties                                               | 2 +-
 halyard-deploy/halyard-deploy.gradle                            | 2 +-
 .../halyard/deploy/spinnaker/v1/service/ClouddriverService.java | 2 +-
 .../halyard/deploy/spinnaker/v1/service/VaultServerService.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 7c6e82de46..fd5adde5d3 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
diff --git a/halyard-deploy/halyard-deploy.gradle b/halyard-deploy/halyard-deploy.gradle
index 64a587e328..a6de3c0f67 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 f61325b540..c9b112932a 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 188c01233f..8e4673f700 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;