From 4008a6e34f4b06a7a60c09241cefc34772ac5712 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 5 Apr 2019 14:21:26 -0400
Subject: [PATCH 1/2] Bumps s-c-build to 2.1.5.BUILD-SNAPSHOT

---
 pom.xml                                        | 2 +-
 spring-cloud-cloudfoundry-dependencies/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5292d32..9dbaa62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.3.BUILD-SNAPSHOT</version>
+		<version>2.1.5.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml
index 9c71d16..fa1f527 100644
--- a/spring-cloud-cloudfoundry-dependencies/pom.xml
+++ b/spring-cloud-cloudfoundry-dependencies/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.3.BUILD-SNAPSHOT</version>
+		<version>2.1.5.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-cloudfoundry-dependencies</artifactId>

From 328b0df8426ca1721ef9e827be4bc1416e32ed9b Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Fri, 10 May 2019 16:06:58 +0200
Subject: [PATCH 2/2] Remove deprecated netflix-core dependency.

---
 spring-cloud-cloudfoundry-discovery/pom.xml                   | 2 +-
 .../cloudfoundry/discovery/CloudFoundryDiscoveryClient.java   | 4 ++--
 .../discovery/CloudFoundryDiscoveryClientTest.java            | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-cloudfoundry-discovery/pom.xml b/spring-cloud-cloudfoundry-discovery/pom.xml
index 1ac2a16..5559710 100644
--- a/spring-cloud-cloudfoundry-discovery/pom.xml
+++ b/spring-cloud-cloudfoundry-discovery/pom.xml
@@ -33,7 +33,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-core</artifactId>
+			<artifactId>spring-cloud-netflix-hystrix</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java
index 13a0e50..4d72b0e 100644
--- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java
+++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java
@@ -81,8 +81,8 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient {
 			metadata.put("applicationId", applicationId);
 			metadata.put("instanceId", applicationIndex);
 
-			return (ServiceInstance) new DefaultServiceInstance(instanceId, name, url, 80, secure,
-					metadata);
+			return (ServiceInstance) new DefaultServiceInstance(instanceId, name, url, 80,
+					secure, metadata);
 		}).collectList().blockOptional().orElse(new ArrayList<>());
 	}
 
diff --git a/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java b/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java
index fa17bfe..b589364 100644
--- a/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java
+++ b/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java
@@ -92,7 +92,8 @@ public class CloudFoundryDiscoveryClientTest {
 		List<ServiceInstance> instances = this.cloudFoundryDiscoveryClient
 				.getInstances(this.hiServiceServiceId);
 		assertThat(instances.size()).as("Wrong instances: " + instances).isEqualTo(1);
-		assertThat(instances.get(0).getInstanceId()).as("Wrong instance ID").isEqualTo("id.0");
+		assertThat(instances.get(0).getInstanceId()).as("Wrong instance ID")
+				.isEqualTo("id.0");
 	}
 
 }