From 690fb244b2a437ec16cf3ffb6b4182c390ce2475 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Mon, 27 Jan 2020 07:36:10 +0100
Subject: [PATCH] BAEL-20855 Move Spring Boot Artifacts module to Spring Boot
 modules

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-artifacts}/README.md                            | 0
 .../spring-boot-artifacts}/pom.xml                              | 2 +-
 .../src/main/java/com/baeldung/webjar/TestController.java       | 0
 .../main/java/com/baeldung/webjar/WebjarsdemoApplication.java   | 0
 .../src/main/resources/application.properties                   | 0
 .../spring-boot-artifacts}/src/main/resources/logback.xml       | 0
 .../src/main/resources/templates/index.html                     | 0
 .../baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java  | 0
 10 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/README.md (100%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/pom.xml (99%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/java/com/baeldung/webjar/TestController.java (100%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java (100%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/resources/application.properties (100%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/resources/logback.xml (100%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/resources/templates/index.html (100%)
 rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 1a111546fa..be81cdbb75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -642,7 +642,6 @@
                 <module>spring-boot-modules</module>
                 <module>spring-boot-admin</module>
                 <module>spring-boot-angular</module>
-                <module>spring-boot-artifacts</module>
                 <module>spring-boot-autoconfiguration</module>
                 <module>spring-boot-bootstrap</module>
                 <module>spring-boot-camel</module>
@@ -1180,7 +1179,6 @@
                 <module>spring-boot-modules</module>
                 <module>spring-boot-admin</module>
                 <module>spring-boot-angular</module>
-                <module>spring-boot-artifacts</module>
                 <module>spring-boot-autoconfiguration</module>
                 <module>spring-boot-bootstrap</module>
                 <module>spring-boot-camel</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 0af6fe449f..bfe5882270 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -14,6 +14,7 @@
     </parent>
 
     <modules>
+        <module>spring-boot-artifacts</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-vue</module>
     </modules>
diff --git a/spring-boot-artifacts/README.md b/spring-boot-modules/spring-boot-artifacts/README.md
similarity index 100%
rename from spring-boot-artifacts/README.md
rename to spring-boot-modules/spring-boot-artifacts/README.md
diff --git a/spring-boot-artifacts/pom.xml b/spring-boot-modules/spring-boot-artifacts/pom.xml
similarity index 99%
rename from spring-boot-artifacts/pom.xml
rename to spring-boot-modules/spring-boot-artifacts/pom.xml
index 97d3c53b49..d6d3886c3e 100644
--- a/spring-boot-artifacts/pom.xml
+++ b/spring-boot-modules/spring-boot-artifacts/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java b/spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java
similarity index 100%
rename from spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java
rename to spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java
diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java b/spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java
similarity index 100%
rename from spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java
rename to spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java
diff --git a/spring-boot-artifacts/src/main/resources/application.properties b/spring-boot-modules/spring-boot-artifacts/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-artifacts/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-artifacts/src/main/resources/application.properties
diff --git a/spring-boot-artifacts/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-artifacts/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-artifacts/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-artifacts/src/main/resources/logback.xml
diff --git a/spring-boot-artifacts/src/main/resources/templates/index.html b/spring-boot-modules/spring-boot-artifacts/src/main/resources/templates/index.html
similarity index 100%
rename from spring-boot-artifacts/src/main/resources/templates/index.html
rename to spring-boot-modules/spring-boot-artifacts/src/main/resources/templates/index.html
diff --git a/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java
similarity index 100%
rename from spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java
rename to spring-boot-modules/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java