From 253d1d1912ff3d44bc1cd677fbcd99a7fb3df2b2 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Tue, 28 Jan 2020 09:54:05 +0100
Subject: [PATCH] BAEL-20867: Move spring-boot-di into spring-boot-modules

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-di}/README.MD                                   | 0
 {spring-boot-di => spring-boot-modules/spring-boot-di}/pom.xml  | 2 +-
 .../src/main/java/com/baeldung/SpringBootDiApplication.java     | 0
 .../src/main/java/com/baeldung/componentscan/ExampleBean.java   | 0
 .../com/baeldung/componentscan/filter/annotation/Animal.java    | 0
 .../filter/annotation/ComponentScanAnnotationFilterApp.java     | 0
 .../com/baeldung/componentscan/filter/annotation/Elephant.java  | 0
 .../componentscan/springapp/SpringComponentScanApp.java         | 0
 .../java/com/baeldung/componentscan/springapp/animals/Cat.java  | 0
 .../java/com/baeldung/componentscan/springapp/animals/Dog.java  | 0
 .../java/com/baeldung/componentscan/springapp/flowers/Rose.java | 0
 .../componentscan/springbootapp/SpringBootComponentScanApp.java | 0
 .../com/baeldung/componentscan/springbootapp/animals/Cat.java   | 0
 .../com/baeldung/componentscan/springbootapp/animals/Dog.java   | 0
 .../com/baeldung/componentscan/springbootapp/flowers/Rose.java  | 0
 17 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/README.MD (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/pom.xml (97%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/SpringBootDiApplication.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/ExampleBean.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java (100%)
 rename {spring-boot-di => spring-boot-modules/spring-boot-di}/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java (100%)

diff --git a/pom.xml b/pom.xml
index 7a26120e8e..cdfdc5c95b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -653,7 +653,6 @@
                 <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-deployment</module>
-                <module>spring-boot-di</module>
                 <module>spring-boot-environment</module>
                 <module>spring-boot-flowable</module>
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
@@ -1188,7 +1187,6 @@
                 <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-deployment</module>
-                <module>spring-boot-di</module>
                 <module>spring-boot-environment</module>
                 <module>spring-boot-flowable</module>
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index b5fbb3c6c6..b13b6f2133 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -15,6 +15,7 @@
 
     <modules>
         <module>spring-boot-data</module>
+        <module>spring-boot-di</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-properties</module>
         <module>spring-boot-testing</module>
diff --git a/spring-boot-di/README.MD b/spring-boot-modules/spring-boot-di/README.MD
similarity index 100%
rename from spring-boot-di/README.MD
rename to spring-boot-modules/spring-boot-di/README.MD
diff --git a/spring-boot-di/pom.xml b/spring-boot-modules/spring-boot-di/pom.xml
similarity index 97%
rename from spring-boot-di/pom.xml
rename to spring-boot-modules/spring-boot-di/pom.xml
index 61059630c4..b24e4a9037 100644
--- a/spring-boot-di/pom.xml
+++ b/spring-boot-modules/spring-boot-di/pom.xml
@@ -12,7 +12,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-di/src/main/java/com/baeldung/SpringBootDiApplication.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/SpringBootDiApplication.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/SpringBootDiApplication.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/SpringBootDiApplication.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/ExampleBean.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/ExampleBean.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/ExampleBean.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/ExampleBean.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
diff --git a/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java b/spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
similarity index 100%
rename from spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
rename to spring-boot-modules/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java