From cd89253474a9ab6ba174c5b79ee9d8aeffe107f1 Mon Sep 17 00:00:00 2001
From: Cavero Barca <carlos.cavero@atos.net>
Date: Mon, 14 Sep 2020 23:58:12 +0200
Subject: [PATCH 1/4] Create the layers configuration, modify the pom and
 Dockerfile

---
 docker/docker-spring-boot/pom.xml             |  1 +
 docker/docker-spring-boot/src/layers.xml      | 27 +++++++++++++++++++
 .../src/main/docker/Dockerfile                |  1 +
 3 files changed, 29 insertions(+)
 create mode 100644 docker/docker-spring-boot/src/layers.xml

diff --git a/docker/docker-spring-boot/pom.xml b/docker/docker-spring-boot/pom.xml
index b9c80bc43a..e8f6c134b1 100644
--- a/docker/docker-spring-boot/pom.xml
+++ b/docker/docker-spring-boot/pom.xml
@@ -45,6 +45,7 @@
                 <configuration>
                     <layers>
                         <enabled>true</enabled>
+                        <configuration>${project.basedir}/src/layers.xml</configuration>
                     </layers>
                 </configuration>
             </plugin>
diff --git a/docker/docker-spring-boot/src/layers.xml b/docker/docker-spring-boot/src/layers.xml
new file mode 100644
index 0000000000..61c9bd9c39
--- /dev/null
+++ b/docker/docker-spring-boot/src/layers.xml
@@ -0,0 +1,27 @@
+<layers xmlns="http://www.springframework.org/schema/boot/layers"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
+                     https://www.springframework.org/schema/boot/layers/layers-2.3.xsd">
+    <application>
+        <into layer="spring-boot-loader">
+            <include>org/springframework/boot/loader/**</include>
+        </into>
+        <into layer="application" />
+    </application>
+    <dependencies>
+        <into layer="snapshot-dependencies">
+            <include>*:*:*SNAPSHOT</include>
+        </into>
+        <into layer="internal-dependencies">
+            <include>com.baeldung.docker:*:*</include>
+        </into>
+        <into layer="dependencies" />
+    </dependencies>
+    <layerOrder>
+        <layer>dependencies</layer>
+        <layer>spring-boot-loader</layer>
+        <layer>internal-dependencies</layer>
+        <layer>snapshot-dependencies</layer>
+        <layer>application</layer>
+    </layerOrder>
+</layers>
\ No newline at end of file
diff --git a/docker/docker-spring-boot/src/main/docker/Dockerfile b/docker/docker-spring-boot/src/main/docker/Dockerfile
index fa147dd69b..663cc94490 100644
--- a/docker/docker-spring-boot/src/main/docker/Dockerfile
+++ b/docker/docker-spring-boot/src/main/docker/Dockerfile
@@ -10,6 +10,7 @@ RUN java -Djarmode=layertools -jar application.jar extract
 FROM adoptopenjdk:11-jre-hotspot
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
+COPY --from=builder internal-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
 COPY --from=builder application/ ./
 ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
\ No newline at end of file

From f84e6099381ef89d4c2276a5fe878e939be04ece Mon Sep 17 00:00:00 2001
From: Cavero Barca <carlos.cavero@atos.net>
Date: Tue, 22 Sep 2020 01:08:21 +0200
Subject: [PATCH 2/4] Add a new project with dependencies to separate the
 layers

---
 docker/docker-internal-dto/pom.xml            | 14 +++++++++
 .../java/com/baeldung/docker/VariableDto.java | 14 +++++++++
 docker/docker-spring-boot/pom.xml             | 28 ++++++++++-------
 .../src/main/docker/Dockerfile                |  4 +--
 docker/pom.xml                                | 30 +++++++++++++++++++
 5 files changed, 77 insertions(+), 13 deletions(-)
 create mode 100644 docker/docker-internal-dto/pom.xml
 create mode 100644 docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
 create mode 100644 docker/pom.xml

diff --git a/docker/docker-internal-dto/pom.xml b/docker/docker-internal-dto/pom.xml
new file mode 100644
index 0000000000..d7ba6d7373
--- /dev/null
+++ b/docker/docker-internal-dto/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.baeldung.docker</groupId>
+        <artifactId>docker-spring-boot-parent</artifactId>
+        <version>0.0.1</version>
+    </parent>
+
+    <artifactId>docker-internal-dto</artifactId>
+
+</project>
\ No newline at end of file
diff --git a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
new file mode 100644
index 0000000000..86e173e351
--- /dev/null
+++ b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
@@ -0,0 +1,14 @@
+package com.baeldung.docker;
+
+public class VariableDto {
+
+    private final String value;
+
+    public VariableDto(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/docker/docker-spring-boot/pom.xml b/docker/docker-spring-boot/pom.xml
index e8f6c134b1..9524f68a5a 100644
--- a/docker/docker-spring-boot/pom.xml
+++ b/docker/docker-spring-boot/pom.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.1.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.baeldung.docker</groupId>
+        <artifactId>docker-spring-boot-parent</artifactId>
+        <version>0.0.1</version>
     </parent>
-    <groupId>com.baeldung.docker</groupId>
-    <artifactId>spring-boot-docker</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-docker</name>
+
+    <artifactId>docker-spring-boot</artifactId>
+
+    <name>docker-spring-boot</name>
     <description>Demo project showing Spring Boot and Docker</description>
 
     <properties>
-        <java.version>8</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
@@ -24,6 +24,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baeldung.docker</groupId>
+            <artifactId>docker-internal-dto</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/docker/docker-spring-boot/src/main/docker/Dockerfile b/docker/docker-spring-boot/src/main/docker/Dockerfile
index 663cc94490..c0fd9c9cdb 100644
--- a/docker/docker-spring-boot/src/main/docker/Dockerfile
+++ b/docker/docker-spring-boot/src/main/docker/Dockerfile
@@ -9,8 +9,8 @@ RUN java -Djarmode=layertools -jar application.jar extract
 
 FROM adoptopenjdk:11-jre-hotspot
 COPY --from=builder dependencies/ ./
-COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder internal-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder internal-dependencies/ ./
+COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder application/ ./
 ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
\ No newline at end of file
diff --git a/docker/pom.xml b/docker/pom.xml
new file mode 100644
index 0000000000..3668ceb0fc
--- /dev/null
+++ b/docker/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.1.RELEASE</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
+
+    <groupId>com.baeldung.docker</groupId>
+    <artifactId>docker-spring-boot-parent</artifactId>
+    <version>0.0.1</version>
+    <name>docker-spring-boot-parent</name>
+    <description>Demo project showing Spring Boot and Docker</description>
+    <packaging>pom</packaging>
+
+    <properties>
+        <java.version>11</java.version>
+    </properties>
+
+    <modules>
+        <module>docker-internal-dto</module>
+        <module>docker-spring-boot</module>
+    </modules>
+
+</project>

From 16b38741becfb811357ef92ea353728c0e16b0e1 Mon Sep 17 00:00:00 2001
From: Cavero Barca <carlos.cavero@atos.net>
Date: Fri, 30 Oct 2020 17:44:33 +0100
Subject: [PATCH 3/4] Correct the artifactid and names to match with the folder
 following the guidelines

---
 docker/docker-internal-dto/pom.xml                            | 3 ++-
 .../main/java/com/baeldung/docker/{ => dto}/VariableDto.java  | 2 +-
 docker/docker-spring-boot/pom.xml                             | 2 +-
 .../com/baeldung/docker/{ => spring}/DemoApplication.java     | 2 +-
 .../com/baeldung/docker/{ => spring}/HelloController.java     | 2 +-
 docker/pom.xml                                                | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename docker/docker-internal-dto/src/main/java/com/baeldung/docker/{ => dto}/VariableDto.java (85%)
 rename docker/docker-spring-boot/src/main/java/com/baeldung/docker/{ => spring}/DemoApplication.java (88%)
 rename docker/docker-spring-boot/src/main/java/com/baeldung/docker/{ => spring}/HelloController.java (90%)

diff --git a/docker/docker-internal-dto/pom.xml b/docker/docker-internal-dto/pom.xml
index d7ba6d7373..01b92f81dc 100644
--- a/docker/docker-internal-dto/pom.xml
+++ b/docker/docker-internal-dto/pom.xml
@@ -5,10 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker-spring-boot-parent</artifactId>
+        <artifactId>docker</artifactId>
         <version>0.0.1</version>
     </parent>
 
     <artifactId>docker-internal-dto</artifactId>
+	<name>docker-internal-dto</name>
 
 </project>
\ No newline at end of file
diff --git a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
similarity index 85%
rename from docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
rename to docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
index 86e173e351..2de3b734ea 100644
--- a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
+++ b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.dto;
 
 public class VariableDto {
 
diff --git a/docker/docker-spring-boot/pom.xml b/docker/docker-spring-boot/pom.xml
index 9524f68a5a..74bd1561cf 100644
--- a/docker/docker-spring-boot/pom.xml
+++ b/docker/docker-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker-spring-boot-parent</artifactId>
+        <artifactId>docker</artifactId>
         <version>0.0.1</version>
     </parent>
 
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
similarity index 88%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java
rename to docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
index e0c1d57e89..9210cabbb3 100644
--- a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java
+++ b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.spring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
similarity index 90%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java
rename to docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
index b463bb557f..430a158011 100644
--- a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java
+++ b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.spring;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/docker/pom.xml b/docker/pom.xml
index 3668ceb0fc..f05c303938 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -12,9 +12,9 @@
     </parent>
 
     <groupId>com.baeldung.docker</groupId>
-    <artifactId>docker-spring-boot-parent</artifactId>
+    <artifactId>docker</artifactId>
     <version>0.0.1</version>
-    <name>docker-spring-boot-parent</name>
+    <name>docker</name>
     <description>Demo project showing Spring Boot and Docker</description>
     <packaging>pom</packaging>
 

From 69c4d136f5d51f1d7a24860bebdafcacd86d4b9b Mon Sep 17 00:00:00 2001
From: Carlos Cavero <carlos.cavero@atos.net>
Date: Mon, 16 Nov 2020 14:45:31 +0100
Subject: [PATCH 4/4] Update pom.xml

Use the correct indentation
---
 docker/docker-internal-dto/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/docker-internal-dto/pom.xml b/docker/docker-internal-dto/pom.xml
index 01b92f81dc..55cef257fe 100644
--- a/docker/docker-internal-dto/pom.xml
+++ b/docker/docker-internal-dto/pom.xml
@@ -10,6 +10,6 @@
     </parent>
 
     <artifactId>docker-internal-dto</artifactId>
-	<name>docker-internal-dto</name>
+    <name>docker-internal-dto</name>
 
-</project>
\ No newline at end of file
+</project>