Merge pull request #68 from mszarlinski/issue-67-update-spring-deps

Upgrade to Spring Cloud Edgware.SR1

pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.3.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.samples</groupId>
 	<artifactId>spring-petclinic-microservices</artifactId>
-	<version>1.5.3</version>
+	<version>1.5.9</version>
     <name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 
@@ -27,9 +27,9 @@
     </modules>
 
     <properties>
-        <assertj.version>3.7.0</assertj.version>
-        <spring-cloud.version>Dalston.SR1</spring-cloud.version>
-        <sleuth.version>1.2.1.RELEASE</sleuth.version>
+        <assertj.version>3.9.0</assertj.version>
+        <spring-cloud.version>Edgware.SR1</spring-cloud.version>
+        <sleuth.version>1.3.1.RELEASE</sleuth.version>
         <java.version>1.8</java.version>
 
 		<docker.image.prefix>mszarlinski</docker.image.prefix>

spring-petclinic-admin-server/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
     <properties>
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
         <!-- Spring Boot Admin -->

spring-petclinic-api-gateway/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
     <properties>
@@ -61,15 +61,15 @@
         </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.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zuul</artifactId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
         </dependency>
 
         <!-- Third parties -->

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java

@@ -24,7 +24,7 @@
  * @author Maciej Szarlinski
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 public class CustomersServiceClient {
 
     private final RestTemplate loadBalancedRestTemplate;

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java

@@ -31,7 +31,7 @@
  * @author Maciej Szarlinski
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 public class VisitsServiceClient {
 
     private final RestTemplate loadBalancedRestTemplate;

spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java

@@ -35,7 +35,7 @@
  * @author Maciej Szarlinski
  */
 @RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 public class ApiGatewayController {
 
     private final CustomersServiceClient customersServiceClient;

spring-petclinic-config-server/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
 	<dependencies>

spring-petclinic-customers-service/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.samples</groupId>
 		<artifactId>spring-petclinic-microservices</artifactId>
-		<version>1.5.3</version>
+		<version>1.5.9</version>
 	</parent>
 
 	<dependencies>

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java

@@ -36,7 +36,7 @@
  */
 @RequestMapping("/owners")
 @RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 @Slf4j
 class OwnerResource {
 

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java

@@ -32,7 +32,7 @@
  * @author Maciej Szarlinski
  */
 @RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 @Slf4j
 class PetResource {
 

spring-petclinic-discovery-server/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
     <dependencies>
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka-server</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>
 
     </dependencies>

spring-petclinic-monitoring/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
     <dependencies>

spring-petclinic-tracing-server/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
     <dependencies>
@@ -34,7 +34,7 @@
         <!-- Spring Cloud -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
         <!-- Third-parties -->

spring-petclinic-vets-service/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.samples</groupId>
 		<artifactId>spring-petclinic-microservices</artifactId>
-		<version>1.5.3</version>
+		<version>1.5.9</version>
 	</parent>
 
 	<dependencies>

spring-petclinic-visits-service/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.9</version>
     </parent>
 
 	<dependencies>
@@ -41,7 +41,7 @@
         </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.cloud</groupId>

spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java

@@ -34,7 +34,7 @@
  * @author Maciej Szarlinski
  */
 @RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 @Slf4j
 public class VisitResource {