Skip to content

Commit 11012b2

Browse files
mohamed-tamanmohamed-taman
committed
Merge branch 'hotfix/0.2.1'
2 parents b05ef3b + 16e7118 commit 11012b2

File tree

11 files changed

+47
-14
lines changed

11 files changed

+47
-14
lines changed

‎product-composite-service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ WORKDIR /home/taman/application
3838
# Copy all layers from builder stage to current image
3939
COPY --from=builder temp/dependencies/ ./
4040
COPY --from=builder temp/snapshot-dependencies/ ./
41-
COPY --from=builder temp/resources/ ./
41+
COPY --from=builder temp/spring-boot-loader/ ./
4242
COPY --from=builder temp/application/ ./
4343

4444
# Expose current application to port 8080

‎product-composite-service/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<version>0.0.1-SNAPSHOT</version>
1414
<name>Product Composite Service</name>
1515
<description>Product Composite Service Spring Boot based project</description>
16+
<packaging>jar</packaging>
1617

1718
<properties>
1819
<skip.dockerization>false</skip.dockerization>

‎product-service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ WORKDIR /home/taman/application
3939
# Copy all layers from builder stage to current image
4040
COPY --from=builder temp/dependencies/ ./
4141
COPY --from=builder temp/snapshot-dependencies/ ./
42-
COPY --from=builder temp/resources/ ./
42+
COPY --from=builder temp/spring-boot-loader/ ./
4343
COPY --from=builder temp/application/ ./
4444

4545
# Expose current application to port 8080

‎product-service/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<version>0.0.1-SNAPSHOT</version>
1414
<name>Product Service</name>
1515
<description>Product Service Spring Boot based project</description>
16+
<packaging>jar</packaging>
1617

1718
<properties>
1819
<skip.dockerization>false</skip.dockerization>

‎recommendation-service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ WORKDIR /home/taman/application
3939
# Copy all layers from builder stage to current image
4040
COPY --from=builder temp/dependencies/ ./
4141
COPY --from=builder temp/snapshot-dependencies/ ./
42-
COPY --from=builder temp/resources/ ./
42+
COPY --from=builder temp/spring-boot-loader/ ./
4343
COPY --from=builder temp/application/ ./
4444

4545
# Expose current application to port 8080

‎recommendation-service/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<version>0.0.1-SNAPSHOT</version>
1414
<name>Recommendation Service</name>
1515
<description>Recommendation Service Spring Boot based project</description>
16+
<packaging>jar</packaging>
1617

1718
<properties>
1819
<skip.dockerization>false</skip.dockerization>

‎review-service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ WORKDIR /home/taman/application
3939
# Copy all layers from builder stage to current image
4040
COPY --from=builder temp/dependencies/ ./
4141
COPY --from=builder temp/snapshot-dependencies/ ./
42-
COPY --from=builder temp/resources/ ./
42+
COPY --from=builder temp/spring-boot-loader/ ./
4343
COPY --from=builder temp/application/ ./
4444

4545
# Expose current application to port 8080

‎review-service/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<version>0.0.1-SNAPSHOT</version>
1414
<name>Review Service</name>
1515
<description>Review Service Spring Boot based project</description>
16+
<packaging>jar</packaging>
1617

1718
<properties>
1819
<skip.dockerization>false</skip.dockerization>

‎store-api/pom.xml

+18-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
<groupId>com.siriusxi.ms.store</groupId>
88
<artifactId>store-api</artifactId>
99
<version>1.0-SNAPSHOT</version>
10-
<packaging>jar</packaging>
11-
1210
<name>Springy Store APIs</name>
1311
<description>Project that define all Springy Store DTOs and REST APIs contracts</description>
12+
<packaging>jar</packaging>
1413

1514
<properties>
1615
<java.version>14</java.version>
1716
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1817
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1918
<!-- Libraries versions -->
20-
<spring.boot.dependencies.version>2.3.0.M3</spring.boot.dependencies.version>
19+
<spring.boot.dependencies.version>2.3.0.M4</spring.boot.dependencies.version>
2120
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
2221
<maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
2322
<maven.failsafe.plugin.version>3.0.0-M4</maven.failsafe.plugin.version>
@@ -80,6 +79,21 @@
8079
</configuration>
8180
</plugin>
8281
</plugins>
83-
8482
</build>
83+
84+
<repositories>
85+
<repository>
86+
<id>spring-milestones</id>
87+
<name>Spring Milestones</name>
88+
<url>https://repo.spring.io/milestone</url>
89+
</repository>
90+
</repositories>
91+
92+
<pluginRepositories>
93+
<pluginRepository>
94+
<id>spring-milestones</id>
95+
<name>Spring Milestones</name>
96+
<url>https://repo.spring.io/milestone</url>
97+
</pluginRepository>
98+
</pluginRepositories>
8599
</project>

‎store-chassis/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<groupId>com.siriusxi.ms.store</groupId>
1414
<artifactId>store-chassis</artifactId>
1515
<version>0.0.1-SNAPSHOT</version>
16-
<packaging>pom</packaging>
1716
<name>Springy Store Chassis</name>
1817
<description>Parent pom project for Springy μServices</description>
18+
<packaging>pom</packaging>
1919

2020
<modules>
2121
<module>../product-composite-service</module>
@@ -35,7 +35,7 @@
3535
<dockerfile-maven-version>1.4.13</dockerfile-maven-version>
3636

3737
<!-- Custom properties -->
38-
<maintainer.name>Mohamed Taman</maintainer.name>
38+
<maintainer.name>"Mohamed Taman"</maintainer.name>
3939
<maintainer.email>[email protected]</maintainer.email>
4040
<docker.repo.image.prefix>siriusxi</docker.repo.image.prefix>
4141
<docker.image.default.tag>latest</docker.image.default.tag>
@@ -191,7 +191,7 @@
191191
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
192192
<IMAGE_VERSION>${project.version}</IMAGE_VERSION>
193193
<IMAGE_NAME>${project.name}</IMAGE_NAME>
194-
<MAINTAINER>"${maintainer.name} (${maintainer.email})"</MAINTAINER>
194+
<MAINTAINER>${maintainer.name} (${maintainer.email})</MAINTAINER>
195195
</buildArgs>
196196
</configuration>
197197
</plugin>

‎store-utils/pom.xml

+18-3
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
<groupId>com.siriusxi.ms.store</groupId>
88
<artifactId>store-utils</artifactId>
99
<version>1.0-SNAPSHOT</version>
10-
<packaging>jar</packaging>
11-
1210
<name>Springy Store Utils</name>
1311
<description>Project that define all Springy Store shared functionality</description>
12+
<packaging>jar</packaging>
1413

1514
<properties>
1615
<java.version>14</java.version>
1716
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1817
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1918
<!-- Libraries versions -->
20-
<spring.boot.dependencies.version>2.3.0.M3</spring.boot.dependencies.version>
19+
<spring.boot.dependencies.version>2.3.0.M4</spring.boot.dependencies.version>
2120
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
2221
<maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
2322
<maven.failsafe.plugin.version>3.0.0-M4</maven.failsafe.plugin.version>
@@ -95,4 +94,20 @@
9594
</plugins>
9695
</build>
9796

97+
<repositories>
98+
<repository>
99+
<id>spring-milestones</id>
100+
<name>Spring Milestones</name>
101+
<url>https://repo.spring.io/milestone</url>
102+
</repository>
103+
</repositories>
104+
105+
<pluginRepositories>
106+
<pluginRepository>
107+
<id>spring-milestones</id>
108+
<name>Spring Milestones</name>
109+
<url>https://repo.spring.io/milestone</url>
110+
</pluginRepository>
111+
</pluginRepositories>
112+
98113
</project>

0 commit comments

Comments
 (0)