From 50d36f15cfb8dff83562cc21bdea057c0a04252a Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 28 Jan 2020 14:02:15 +0100
Subject: [PATCH] BAEL-19751: Move spring-boot-admin into spring-boot-modules

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-admin}/README.md                                | 0
 .../spring-boot-admin}/pom.xml                                  | 2 +-
 .../spring-boot-admin}/spring-boot-admin-client/.gitignore      | 0
 .../spring-boot-admin}/spring-boot-admin-client/pom.xml         | 1 -
 .../springbootadminclient/SpringBootAdminClientApplication.java | 0
 .../src/main/resources/application.properties                   | 0
 .../spring-boot-admin-client/src/main/resources/logback.xml     | 0
 .../SpringBootAdminClientApplicationIntegrationTest.java        | 0
 .../src/test/java/org/baeldung/SpringContextTest.java           | 0
 .../spring-boot-admin}/spring-boot-admin-server/.gitignore      | 0
 .../spring-boot-admin}/spring-boot-admin-server/pom.xml         | 1 -
 .../springbootadminserver/SpringBootAdminServerApplication.java | 0
 .../baeldung/springbootadminserver/configs/HazelcastConfig.java | 0
 .../springbootadminserver/configs/NotifierConfiguration.java    | 0
 .../springbootadminserver/configs/WebSecurityConfig.java        | 0
 .../src/main/resources/application.properties                   | 0
 .../spring-boot-admin-server/src/main/resources/logback.xml     | 0
 .../springbootadminserver/HazelcastConfigIntegrationTest.java   | 0
 .../NotifierConfigurationIntegrationTest.java                   | 0
 .../springbootadminserver/WebSecurityConfigIntegrationTest.java | 0
 .../src/test/java/org/baeldung/SpringContextTest.java           | 0
 23 files changed, 2 insertions(+), 5 deletions(-)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/README.md (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/pom.xml (93%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/.gitignore (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/pom.xml (97%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/src/main/resources/application.properties (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/src/main/resources/logback.xml (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/.gitignore (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/pom.xml (98%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/main/resources/application.properties (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/main/resources/logback.xml (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java (100%)
 rename {spring-boot-admin => spring-boot-modules/spring-boot-admin}/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 7a26120e8e..24621e4b45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,7 +640,6 @@
 
                 <module>spring-boot</module>
                 <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>
@@ -1175,7 +1174,6 @@
 
                 <module>spring-boot</module>
                 <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>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index b5fbb3c6c6..d6791ac3b4 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -14,6 +14,7 @@
     </parent>
 
     <modules>
+        <module>spring-boot-admin</module>
         <module>spring-boot-data</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-properties</module>
diff --git a/spring-boot-admin/README.md b/spring-boot-modules/spring-boot-admin/README.md
similarity index 100%
rename from spring-boot-admin/README.md
rename to spring-boot-modules/spring-boot-admin/README.md
diff --git a/spring-boot-admin/pom.xml b/spring-boot-modules/spring-boot-admin/pom.xml
similarity index 93%
rename from spring-boot-admin/pom.xml
rename to spring-boot-modules/spring-boot-admin/pom.xml
index e4b2764a3b..817d4ad00c 100644
--- a/spring-boot-admin/pom.xml
+++ b/spring-boot-modules/spring-boot-admin/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>
 
     <modules>
diff --git a/spring-boot-admin/spring-boot-admin-client/.gitignore b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/.gitignore
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-client/.gitignore
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/.gitignore
diff --git a/spring-boot-admin/spring-boot-admin-client/pom.xml b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/pom.xml
similarity index 97%
rename from spring-boot-admin/spring-boot-admin-client/pom.xml
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/pom.xml
index 47abfdddc2..996bf424f4 100644
--- a/spring-boot-admin/spring-boot-admin-client/pom.xml
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/pom.xml
@@ -12,7 +12,6 @@
         <groupId>com.baeldung</groupId>
         <artifactId>spring-boot-admin</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../spring-boot-admin</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java
diff --git a/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties
diff --git a/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml
diff --git a/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
diff --git a/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-boot-admin/spring-boot-admin-server/.gitignore b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/.gitignore
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/.gitignore
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/.gitignore
diff --git a/spring-boot-admin/spring-boot-admin-server/pom.xml b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml
similarity index 98%
rename from spring-boot-admin/spring-boot-admin-server/pom.xml
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml
index d0d2d7a1ef..8ab9291c0c 100644
--- a/spring-boot-admin/spring-boot-admin-server/pom.xml
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml
@@ -12,7 +12,6 @@
         <groupId>com.baeldung</groupId>
         <artifactId>spring-boot-admin</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../spring-boot-admin</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties
diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java