update eureka code to boot 2

spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml

@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
             <version>${spring-cloud-starter-eureka.version}</version>
         </dependency>
         <dependency>

spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     name: spring-cloud-eureka-client
 
 server:
-  port: 8081
+  port: 8082
 
 eureka:
   client:

spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml

@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka-server</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
             <version>${spring-cloud-starter-eureka.version}</version>
         </dependency>
         <dependency>

spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml

@@ -24,9 +24,11 @@
     </modules>
 
     <properties>
-        <spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
+        <spring-boot-maven-plugin.version>2.0.1.RELEASE</spring-boot-maven-plugin.version>
         <commons-config.version>1.10</commons-config.version>
         <rxjava.version>1.2.10</rxjava.version>
+        <spring-boot.version>2.0.1.RELEASE</spring-boot.version>
+        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml

@@ -16,11 +16,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zuul</artifactId>
+            <artifactId>spring-cloud-starter-netflix-zuul</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>commons-configuration</groupId>
@@ -32,10 +32,6 @@
             <artifactId>rxjava</artifactId>
             <version>${rxjava.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
     </dependencies>
     
     <dependencyManagement>

spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties

@@ -3,7 +3,4 @@ spring.application.name=zuul-server
 eureka.instance.preferIpAddress=true
 eureka.client.registerWithEureka=true
 eureka.client.fetchRegistry=true
-eureka.serviceurl.defaultzone=http://localhost:8761/eureka/
-management.security.enabled=false
-security.basic.enabled=false
-hystrix.command.default.execution.timeout.enabled=false
+eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://localhost:8761/eureka}