From ef452c09352030be44ef251fd66429ba702c655d Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Wed, 22 May 2019 12:12:05 +0300
Subject: [PATCH 1/2] Fix mockserver related failures

Fixes: #397
---
 spring-cloud-kubernetes-dependencies/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 032542b5..83309a95 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -37,6 +37,7 @@
 		<kubernetes-client.version>4.2.2</kubernetes-client.version>
 		<istio-client.version>1.0.0</istio-client.version>
 		<mockwebserver.version>0.1.1</mockwebserver.version>
+		<okhttp.version>3.12.0</okhttp.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -171,6 +172,16 @@
 				</exclusions>
 			</dependency>
 
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>logging-interceptor</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
 
 		</dependencies>
 	</dependencyManagement>

From 436a9a3dbf3d042f166c847db5ea95103c02af66 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Wed, 22 May 2019 12:17:45 +0300
Subject: [PATCH 2/2] Fix broken test

---
 .../springframework/cloud/kubernetes/config/ConfigMapsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java
index ef0be748..97058716 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java
@@ -61,7 +61,7 @@ public class ConfigMapsTest {
 		KubernetesClient client = this.server.getClient();
 		ConfigMapList configMapList = client.configMaps().inNamespace("ns2").list();
 		assertThat(configMapList).isNotNull();
-		assertThat(configMapList.getAdditionalProperties().size()).isEqualTo(1);
+		assertThat(configMapList.getAdditionalProperties()).containsKey("data");
 		@SuppressWarnings("unchecked")
 		Map<String, String> data = (Map<String, String>) configMapList
 				.getAdditionalProperties().get("data");