From e97cf2ce42c93ac0c9553ea5c7fcb873bd16383e Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Mon, 10 Jan 2022 11:46:51 -0500
Subject: [PATCH 1/2] Update to latest k8s java client.  Fixes #934

---
 spring-cloud-kubernetes-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index c3afc579..174a687e 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -36,7 +36,7 @@
 		<arquillian-cube.version>1.15.2</arquillian-cube.version>
 		<hoverfly.version>0.13.0</hoverfly.version>
 		<kubernetes-client.version>4.13.3</kubernetes-client.version>
-		<kubernetes-java-client.version>11.0.3</kubernetes-java-client.version>
+		<kubernetes-java-client.version>11.0.4</kubernetes-java-client.version>
 		<istio-client.version>1.5.5</istio-client.version>
 		<mockwebserver.version>0.1.2</mockwebserver.version>
 		<wiremock.version>2.26.3</wiremock.version>

From 55c4f4ed10e5afe17726848f5f1ac87d66d20da1 Mon Sep 17 00:00:00 2001
From: erabii <eugen.rabii@gmail.com>
Date: Wed, 12 Jan 2022 16:24:30 +0200
Subject: [PATCH 2/2] Fix 943 (#947)

---
 spring-cloud-kubernetes-client-config/pom.xml | 5 -----
 spring-cloud-kubernetes-dependencies/pom.xml  | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index 85c0cfb6..5e89315a 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -58,11 +58,6 @@
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-rsa</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 174a687e..9a52f722 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -40,6 +40,7 @@
 		<istio-client.version>1.5.5</istio-client.version>
 		<mockwebserver.version>0.1.2</mockwebserver.version>
 		<wiremock.version>2.26.3</wiremock.version>
+		<commons.collections4.version>4.4</commons.collections4.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -51,6 +52,12 @@
 				<scope>import</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-collections4</artifactId>
+				<version>${commons.collections4.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>io.kubernetes</groupId>
 				<artifactId>client-java</artifactId>