diff --git a/pom.xml b/pom.xml
index d81224f72bf6660554ead779d6891c0c286c35e2..50d5f0e0d9363344d85fcb9feb0f460a2316e163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.springframework.samples</groupId>
<artifactId>spring-petclinic-microservices</artifactId>
<version>1.4.2</version>
- <name>Spring Petclinic :: Parent POM</name>
+ <name>${project.artifactId}</name>
<packaging>pom</packaging>
<modules>
@@ -29,6 +29,7 @@
<properties>
<assertj.version>3.5.2</assertj.version>
<spring-cloud.version>Camden.SR1</spring-cloud.version>
+ <java.version>1.8</java.version>
</properties>
<dependencyManagement>
@@ -55,31 +56,4 @@
</dependencies>
</dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.4.13</version>
- <configuration>
- <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
- <dockerDirectory>src/main/docker</dockerDirectory>
- <resources>
- <resource>
- <targetPath>/</targetPath>
- <directory>${project.build.directory}</directory>
- <include>${project.build.finalName}.war</include>
- </resource>
- </resources>
- <forceTags>true</forceTags>
- <imageTags>
- <imageTag>${project.version}</imageTag>
- <imageTag>latest</imageTag>
- </imageTags>
- <useConfigFile>true</useConfigFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
index 4bb66d39fffb5a144a7c16fcb2390652d5b6f25a..3a8cab7c282b98d25d45bc7dc8fff9c03fb8ac84 100644
--- a/spring-petclinic-api-gateway/pom.xml
+++ b/spring-petclinic-api-gateway/pom.xml
@@ -7,8 +7,6 @@
<artifactId>spring-petclinic-api-gateway</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-api-gateway</name>
<description>Spring PetClinic API Gateway</description>
<parent>
@@ -17,49 +15,45 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-zuul</artifactId>
- </dependency>
+
+ <!-- Petclinic -->
<dependency>
<groupId>org.springframework.samples</groupId>
<artifactId>spring-petclinic-ui</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional>
+ <artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <optional>true</optional>
+ <artifactId>spring-boot-starter-web</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
+
+ <!-- Spring Cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
@@ -74,14 +68,9 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+ <artifactId>spring-cloud-starter-zuul</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml
index da97d8e74e30cdfa4aacb98cbb3d7816e9f9d7db..2c937470009168c3aa47d078cd5ad33aef0bc2cf 100644
--- a/spring-petclinic-config-server/pom.xml
+++ b/spring-petclinic-config-server/pom.xml
@@ -7,8 +7,6 @@
<artifactId>spring-petclinic-config-server</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-config-server</name>
<description>Spring PetClinic Config Server</description>
<parent>
@@ -17,23 +15,20 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
+ <!-- Spring Boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Spring Cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-server</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<dependencyManagement>
diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml
index f5bc0763e45df64a19bdc194a07357122a1c86f6..3ede011a491950d035a3ec0a710bc5687f6c7fde 100644
--- a/spring-petclinic-customers-service/pom.xml
+++ b/spring-petclinic-customers-service/pom.xml
@@ -7,8 +7,6 @@
<artifactId>spring-petclinic-customers-service</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-customers-service</name>
<description>Spring PetClinic Customers Service</description>
<parent>
@@ -17,45 +15,33 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
+ <!-- Petclinic -->
+ <dependency>
+ <groupId>org.springframework.samples.petclinic.monitoring</groupId>
+ <artifactId>spring-petclinic-monitoring</artifactId>
+ </dependency>
+
+ <!-- Spring Boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.samples.petclinic.monitoring</groupId>
- <artifactId>spring-petclinic-monitoring</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
-
+ <!-- Spring Cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
@@ -73,16 +59,27 @@
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- Third parties -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+
</dependencies>
<build>
diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml
index 02f9b3b352723bad5840876e0b726cea8c83af7f..b818f2ff3327fff04fc46e93275f4dca8677f5c6 100644
--- a/spring-petclinic-discovery-server/pom.xml
+++ b/spring-petclinic-discovery-server/pom.xml
@@ -7,8 +7,6 @@
<artifactId>spring-petclinic-discovery-server</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-discovery-server</name>
<description>Spring PetClinic Discovery Server</description>
<parent>
@@ -17,27 +15,24 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
+ <!-- Spring Boot -->
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka-server</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
+
+ <!-- Spring Cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
-
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-eureka-server</artifactId>
</dependency>
+
</dependencies>
<build>
diff --git a/spring-petclinic-monitoring/pom.xml b/spring-petclinic-monitoring/pom.xml
index 7b1d4609f7399e93895eed62456afa6f3f1b5b86..76bfe62deee11f57f1787d87f2db17e678a88d78 100644
--- a/spring-petclinic-monitoring/pom.xml
+++ b/spring-petclinic-monitoring/pom.xml
@@ -8,16 +8,10 @@
<artifactId>spring-petclinic-monitoring</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-monitoring</name>
<description>Spring PetClinic monitoring utilities</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
<dependencies>
+ <!-- Third-parties -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
diff --git a/spring-petclinic-tracing-server/pom.xml b/spring-petclinic-tracing-server/pom.xml
index 0d283299a1c7b8049301e116ae29b43c6b5546a0..f6197cf91c976cfc75ffd1b7296ff6b0f2330cbb 100644
--- a/spring-petclinic-tracing-server/pom.xml
+++ b/spring-petclinic-tracing-server/pom.xml
@@ -8,8 +8,6 @@
<artifactId>spring-petclinic-zipkin-server</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-tracing-server</name>
<description>Zipkin server with UI</description>
<parent>
@@ -18,13 +16,8 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
+ <!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -33,25 +26,29 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Spring Cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
+
+ <!-- Third-parties -->
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
</dependency>
-
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-autoconfigure-ui</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
diff --git a/spring-petclinic-ui/pom.xml b/spring-petclinic-ui/pom.xml
index 812840e02bc5e57f5a6bacc8d0e82f47da7c4d5b..3b39720102ec8cf9ef605627262682eceff6fdbc 100644
--- a/spring-petclinic-ui/pom.xml
+++ b/spring-petclinic-ui/pom.xml
@@ -8,8 +8,8 @@
<version>1.4.2</version>
</parent>
<artifactId>spring-petclinic-ui</artifactId>
- <name>Spring Petclinic :: AngularJS UI</name>
<version>1.4.2</version>
+ <description>Front-end webjar based on Angular 1</description>
<properties>
<node.version>v4.4.3</node.version>
diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml
index 9abef8bfd0d80c99f9357626009f315c901dbed8..b5c2c4c7410abb4ac58c4e907d3a5c58d0a261a9 100644
--- a/spring-petclinic-vets-service/pom.xml
+++ b/spring-petclinic-vets-service/pom.xml
@@ -7,8 +7,6 @@
<artifactId>spring-petclinic-vets-service</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-vets-service</name>
<description>Spring PetClinic Vets Service</description>
<parent>
@@ -17,34 +15,50 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
+ <!-- Spring Boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-cache</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+
+ <!-- Spring Cloud-->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-eureka</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <optional>true</optional>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-sleuth</artifactId>
</dependency>
+
+ <!-- Third parties-->
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
@@ -53,7 +67,6 @@
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
-
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -65,29 +78,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-sleuth</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-sleuth-zipkin</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml
index 06f723912606eb9e838cb9d0a76120c6a8c9c59f..3cb5fd72fb388082e5dd48e056cf4147aa8e005f 100644
--- a/spring-petclinic-visits-service/pom.xml
+++ b/spring-petclinic-visits-service/pom.xml
@@ -7,8 +7,6 @@
<artifactId>spring-petclinic-visits-service</artifactId>
<version>1.4.2</version>
<packaging>jar</packaging>
-
- <name>spring-petclinic-visits-service</name>
<description>Spring PetClinic Visits Service</description>
<parent>
@@ -17,13 +15,12 @@
<version>1.4.2</version>
</parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- </properties>
-
<dependencies>
+ <!-- Spring Boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -34,20 +31,11 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
-
+ <!-- Spring Cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
@@ -65,11 +53,18 @@
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
</dependency>
+ <!-- Third parties -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<build>