Merge branch 'hotfix/0.2.1'

mohamed-taman · Apr 6, 2020 · 11012b2 · 11012b2
2 parents b05ef3b + 16e7118
commit 11012b2
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 14 deletions.
diff --git a/product-composite-service/Dockerfile b/product-composite-service/Dockerfile
@@ -38,7 +38,7 @@ WORKDIR /home/taman/application
 # Copy all layers from builder stage to current image
 COPY --from=builder temp/dependencies/ ./
 COPY --from=builder temp/snapshot-dependencies/ ./
-COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/spring-boot-loader/ ./
 COPY --from=builder temp/application/ ./
 
 # Expose current application to port 8080

diff --git a/product-composite-service/pom.xml b/product-composite-service/pom.xml
@@ -13,6 +13,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Product Composite Service</name>
 	<description>Product Composite Service Spring Boot based project</description>
+	<packaging>jar</packaging>
 
 	<properties>
 		<skip.dockerization>false</skip.dockerization>

diff --git a/product-service/Dockerfile b/product-service/Dockerfile
@@ -39,7 +39,7 @@ WORKDIR /home/taman/application
 # Copy all layers from builder stage to current image
 COPY --from=builder temp/dependencies/ ./
 COPY --from=builder temp/snapshot-dependencies/ ./
-COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/spring-boot-loader/ ./
 COPY --from=builder temp/application/ ./
 
 # Expose current application to port 8080

diff --git a/product-service/pom.xml b/product-service/pom.xml
@@ -13,6 +13,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Product Service</name>
 	<description>Product Service Spring Boot based project</description>
+	<packaging>jar</packaging>
 
 	<properties>
 		<skip.dockerization>false</skip.dockerization>

diff --git a/recommendation-service/Dockerfile b/recommendation-service/Dockerfile
@@ -39,7 +39,7 @@ WORKDIR /home/taman/application
 # Copy all layers from builder stage to current image
 COPY --from=builder temp/dependencies/ ./
 COPY --from=builder temp/snapshot-dependencies/ ./
-COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/spring-boot-loader/ ./
 COPY --from=builder temp/application/ ./
 
 # Expose current application to port 8080

diff --git a/recommendation-service/pom.xml b/recommendation-service/pom.xml
@@ -13,6 +13,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Recommendation Service</name>
 	<description>Recommendation Service Spring Boot based project</description>
+	<packaging>jar</packaging>
 
 	<properties>
 		<skip.dockerization>false</skip.dockerization>

diff --git a/review-service/Dockerfile b/review-service/Dockerfile
@@ -39,7 +39,7 @@ WORKDIR /home/taman/application
 # Copy all layers from builder stage to current image
 COPY --from=builder temp/dependencies/ ./
 COPY --from=builder temp/snapshot-dependencies/ ./
-COPY --from=builder temp/resources/ ./
+COPY --from=builder temp/spring-boot-loader/ ./
 COPY --from=builder temp/application/ ./
 
 # Expose current application to port 8080

diff --git a/review-service/pom.xml b/review-service/pom.xml
@@ -13,6 +13,7 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Review Service</name>
 	<description>Review Service Spring Boot based project</description>
+	<packaging>jar</packaging>
 
 	<properties>
 		<skip.dockerization>false</skip.dockerization>

diff --git a/store-api/pom.xml b/store-api/pom.xml
@@ -7,17 +7,16 @@
     <groupId>com.siriusxi.ms.store</groupId>
     <artifactId>store-api</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
     <name>Springy Store APIs</name>
     <description>Project that define all Springy Store DTOs and REST APIs contracts</description>
+    <packaging>jar</packaging>
 
     <properties>
         <java.version>14</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- Libraries versions -->
-        <spring.boot.dependencies.version>2.3.0.M3</spring.boot.dependencies.version>
+        <spring.boot.dependencies.version>2.3.0.M4</spring.boot.dependencies.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
         <maven.failsafe.plugin.version>3.0.0-M4</maven.failsafe.plugin.version>
@@ -80,6 +79,21 @@
                 </configuration>
             </plugin>
         </plugins>
-
     </build>
+
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/store-chassis/pom.xml b/store-chassis/pom.xml
@@ -13,9 +13,9 @@
     <groupId>com.siriusxi.ms.store</groupId>
     <artifactId>store-chassis</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
     <name>Springy Store Chassis</name>
     <description>Parent pom project for Springy μServices</description>
+    <packaging>pom</packaging>
 
     <modules>
         <module>../product-composite-service</module>
@@ -35,7 +35,7 @@
         <dockerfile-maven-version>1.4.13</dockerfile-maven-version>
 
         <!--  Custom properties  -->
-        <maintainer.name>Mohamed Taman</maintainer.name>
+        <maintainer.name>"Mohamed Taman"</maintainer.name>
         <maintainer.email>[email protected]</maintainer.email>
         <docker.repo.image.prefix>siriusxi</docker.repo.image.prefix>
         <docker.image.default.tag>latest</docker.image.default.tag>
@@ -191,7 +191,7 @@
                         <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                         <IMAGE_VERSION>${project.version}</IMAGE_VERSION>
                         <IMAGE_NAME>${project.name}</IMAGE_NAME>
-                        <MAINTAINER>"${maintainer.name} (${maintainer.email})"</MAINTAINER>
+                        <MAINTAINER>${maintainer.name} (${maintainer.email})</MAINTAINER>
                     </buildArgs>
                 </configuration>
             </plugin>

diff --git a/store-utils/pom.xml b/store-utils/pom.xml
@@ -7,17 +7,16 @@
     <groupId>com.siriusxi.ms.store</groupId>
     <artifactId>store-utils</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
     <name>Springy Store Utils</name>
     <description>Project that define all Springy Store shared functionality</description>
+    <packaging>jar</packaging>
 
     <properties>
         <java.version>14</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- Libraries versions -->
-        <spring.boot.dependencies.version>2.3.0.M3</spring.boot.dependencies.version>
+        <spring.boot.dependencies.version>2.3.0.M4</spring.boot.dependencies.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
         <maven.failsafe.plugin.version>3.0.0-M4</maven.failsafe.plugin.version>
@@ -95,4 +94,20 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>