From d22909658f074271de2d74cf9b0c16fdb0fecae2 Mon Sep 17 00:00:00 2001
From: Xiangbin Han <xiangbin.han@ericsson.com>
Date: Thu, 2 Aug 2018 16:21:43 +0800
Subject: [PATCH 1/2] Upgrade to Spring Boot 2.0.3.RELEASE and to Spring Cloud
 Finchley.RELEASE.

---
 client/pom.xml                                      |  4 ++--
 .../src/main/java/demo/HelloClientApplication.java  |  4 ++--
 pom.xml                                             |  4 ++--
 server/pom.xml                                      |  4 ++--
 .../src/main/java/demo/HelloServerApplication.java  | 13 +++++++++++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index bf82281..fb9bbf5 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -34,11 +34,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</artifactId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/client/src/main/java/demo/HelloClientApplication.java b/client/src/main/java/demo/HelloClientApplication.java
index 1131de6..82f305e 100644
--- a/client/src/main/java/demo/HelloClientApplication.java
+++ b/client/src/main/java/demo/HelloClientApplication.java
@@ -4,8 +4,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/pom.xml b/pom.xml
index 55e0f38..6a70194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.2.RELEASE</version>
+		<version>2.0.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Camden.BUILD-SNAPSHOT</version>
+				<version>Finchley.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/server/pom.xml b/server/pom.xml
index 0502fa7..696c425 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -34,11 +34,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</artifactId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/server/src/main/java/demo/HelloServerApplication.java b/server/src/main/java/demo/HelloServerApplication.java
index 08d09fa..0929b46 100644
--- a/server/src/main/java/demo/HelloServerApplication.java
+++ b/server/src/main/java/demo/HelloServerApplication.java
@@ -1,5 +1,7 @@
 package demo;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -21,8 +23,15 @@ public class HelloServerApplication {
 
 	@RequestMapping("/")
 	public String hello() {
-		ServiceInstance localInstance = client.getLocalServiceInstance();
-		return "Hello World: "+ localInstance.getServiceId()+":"+localInstance.getHost()+":"+localInstance.getPort();
+	    StringBuilder result = new StringBuilder("Hello World: ");
+	    List<String> services = client.getServices();
+	    for(String serviceId: services) {
+	        List<ServiceInstance> localInstances = client.getInstances(serviceId);
+	        for(ServiceInstance instance: localInstances) {
+	            result.append(instance.getServiceId()+":"+instance.getHost()+":"+instance.getPort());
+	        }
+	    }
+		return result.toString();
 	}
 
 	public static void main(String[] args) {

From 7eda19d5f19353b9bf605a4f8592e2f5ae66035c Mon Sep 17 00:00:00 2001
From: Xiangbin Han <xiangbin.han@ericsson.com>
Date: Fri, 3 Aug 2018 15:33:42 +0800
Subject: [PATCH 2/2] Upgrade to SpringBoot 2.0.4.RELEASE and SpringCloud
 Finchley.SR1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a70194..e62f73d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Finchley.RELEASE</version>
+				<version>Finchley.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>