diff --git a/pom.xml b/pom.xml
index 2fd8a6f69863a6979ca92ee392de346d1bf44ba9..2709068157e73e7c7e9f26ad4c20a1500c834666 100644
--- a/pom.xml
+++ b/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>
diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml
index 4f36be9cd2f5384732f015c7fb2ef1429d1a1df1..81de089b85c967561e13bbf0d58fecaab74b20f0 100644
--- a/spring-petclinic-admin-server/pom.xml
+++ b/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 -->
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
index b87a436a6675d78897823a01df20d9ae3c1e32db..cfaf6731bdeeb9b127d0470e7e373a3cb2e88ad1 100644
--- a/spring-petclinic-api-gateway/pom.xml
+++ b/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,7 +61,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>
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-zuul</artifactId>
+ <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
</dependency>
<!-- Third parties -->
diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java
index 098df0996b1b5c7224b0bf5320861428ceadda86..3f27a7ae4b8c26f25d94b34c4c12f4900a9ed1ff 100644
--- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java
+++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java
@@ -24,7 +24,7 @@ import org.springframework.web.client.RestTemplate;
* @author Maciej Szarlinski
*/
@Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
public class CustomersServiceClient {
private final RestTemplate loadBalancedRestTemplate;
diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java
index cd8f2e8a3f048970c6109eb5cf96c3d8e2871a10..1ac20feb6a1f58fdcc341d3ab414133510c0f8b9 100644
--- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java
+++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java
@@ -31,7 +31,7 @@ import static java.util.stream.Collectors.groupingBy;
* @author Maciej Szarlinski
*/
@Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
public class VisitsServiceClient {
private final RestTemplate loadBalancedRestTemplate;
diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java
index d186315b3deab9ab93abd794e6665193ccc877d8..349390686d21c420c7b910bb4c92df08631d116f 100644
--- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java
+++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java
@@ -35,7 +35,7 @@ import static java.util.Collections.emptyList;
* @author Maciej Szarlinski
*/
@RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
public class ApiGatewayController {
private final CustomersServiceClient customersServiceClient;
diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml
index ab681f3308068fd1b74e1b3ec0a3d974ce916940..1c68bda8f4d490eb28ea203b040eb84b7cae0e51 100644
--- a/spring-petclinic-config-server/pom.xml
+++ b/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>
diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml
index ce81ae9ba93e8ae345713bdcab27f758933aff1b..b7d380abe16af8b3accd49dafd0d512a8dd97467 100644
--- a/spring-petclinic-customers-service/pom.xml
+++ b/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>
diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java
index ca09b58f2144a1c57c5c19132e3b1cc1115a9130..802c73d9bee787bf0a52ee2f2df6a80ba07baed6 100644
--- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java
@@ -36,7 +36,7 @@ import java.util.List;
*/
@RequestMapping("/owners")
@RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
@Slf4j
class OwnerResource {
diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java
index 4bc30831cc365d9ed1415c11ad7f9fd2e80d6733..a7c7d3032e65d71653665b5083d17fea1cf6cee5 100644
--- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java
@@ -32,7 +32,7 @@ import java.util.List;
* @author Maciej Szarlinski
*/
@RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
@Slf4j
class PetResource {
diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml
index 2697694e5584e11aa6563cb65d4637a97b7f601a..b71f3e112a8110756c1447976b1b1612d3129096 100644
--- a/spring-petclinic-discovery-server/pom.xml
+++ b/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>
diff --git a/spring-petclinic-monitoring/pom.xml b/spring-petclinic-monitoring/pom.xml
index 8b333a3c71dfefc75f6b6f50bf2f7b4a1745fab4..5f059d6a565da66080388d8b1b3f1b9d135bb555 100644
--- a/spring-petclinic-monitoring/pom.xml
+++ b/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>
diff --git a/spring-petclinic-tracing-server/pom.xml b/spring-petclinic-tracing-server/pom.xml
index e3753c1690bc84c07cd90c279872c412867b6a55..efeec6dfbfeeb1f005b87599a4ac86c34cdfb202 100644
--- a/spring-petclinic-tracing-server/pom.xml
+++ b/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 -->
diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml
index 8d23f018426461611b12e45209ef0c5ee4200ef8..1ffc4e72cecb845514646a298b84d715ab8199b0 100644
--- a/spring-petclinic-vets-service/pom.xml
+++ b/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>
diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml
index 5546259f69690b38b29ee42cbbaf4c9fc00fc44c..3d30189f6428707b91178c223921435f42c22e40 100644
--- a/spring-petclinic-visits-service/pom.xml
+++ b/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>
diff --git a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
index b99a01dcc4d71661cffc40cd3ff4fe1365b091ad..0d0199fba6d8a8b035c1fe65b117ccfa59587a7f 100644
--- a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
+++ b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
@@ -34,7 +34,7 @@ import java.util.List;
* @author Maciej Szarlinski
*/
@RestController
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
@Slf4j
public class VisitResource {