From f9a5e78b826ba51ad3ffe22613f8b83ac20fe791 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Fri, 14 Feb 2025 10:20:20 -0500
Subject: [PATCH] Specify okhttp dependency

This is needed since Spring Boot no longer manages the version.  The version is managed in Spring Cloud Commons.  See https://github.com/spring-cloud/spring-cloud-commons/pull/1470. Fixes #1813
---
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml | 11 +++++++++++
 spring-cloud-kubernetes-fabric8-leader/pom.xml     |  5 -----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index e8e4672710..4a856d1e2b 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -49,6 +49,17 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-kubernetes-commons</artifactId>
 		</dependency>
+		<!-- Spring Boot removed its dependency management of okhttp in Spring Boot 3.4.0 -->
+		<!-- This resulted in a different version fo okhttp in Spring Cloud 2024.0.0 -->
+		<!-- Spring Cloud is now managing the okhttp dependency version in Spring Cloud Commons -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>logging-interceptor</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index 749bd96299..df602442ca 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -67,10 +67,5 @@
 			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>