From ade8ffb8cedf76e20a14f8674ab226054c932fb3 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Mon, 27 Jan 2020 16:59:16 +0100
Subject: [PATCH 1/4] BAEL-20873 Move Spring Boot Kotlin module to Spring Boot
 modules

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-kotlin}/README.md                               | 0
 .../spring-boot-kotlin}/pom.xml                                 | 2 +-
 .../com/baeldung/nonblockingcoroutines/SpringApplication.kt     | 0
 .../baeldung/nonblockingcoroutines/config/DatastoreConfig.kt    | 0
 .../nonblockingcoroutines/config/RouterConfiguration.kt         | 0
 .../nonblockingcoroutines/config/WebClientConfiguration.kt      | 0
 .../nonblockingcoroutines/controller/ProductController.kt       | 0
 .../controller/ProductControllerCoroutines.kt                   | 0
 .../nonblockingcoroutines/controller/ProductStockView.kt        | 0
 .../baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt  | 0
 .../kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt  | 0
 .../nonblockingcoroutines/repository/ProductRepository.kt       | 0
 .../repository/ProductRepositoryCoroutines.kt                   | 0
 .../src/main/resources/application.properties                   | 0
 .../spring-boot-kotlin}/src/main/resources/logback.xml          | 0
 .../com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt    | 0
 18 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/README.md (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/pom.xml (98%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/resources/application.properties (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/main/resources/logback.xml (100%)
 rename {spring-boot-kotlin => spring-boot-modules/spring-boot-kotlin}/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt (100%)

diff --git a/pom.xml b/pom.xml
index 1a111546fa..6392c7e214 100644
--- a/pom.xml
+++ b/pom.xml
@@ -660,7 +660,6 @@
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-keycloak</module>
-                <module>spring-boot-kotlin</module>
                 <module>spring-boot-libraries</module>
                 <module>spring-boot-logging-log4j2</module>
                 <module>spring-boot-mvc-2</module>
@@ -1198,7 +1197,6 @@
                 <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-keycloak</module>
-                <module>spring-boot-kotlin</module>
                 <module>spring-boot-libraries</module>
                 <module>spring-boot-logging-log4j2</module>
                 <module>spring-boot-mvc</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 0af6fe449f..fc1f96350f 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -14,6 +14,7 @@
     </parent>
 
     <modules>
+        <module>spring-boot-kotlin</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-vue</module>
     </modules>
diff --git a/spring-boot-kotlin/README.md b/spring-boot-modules/spring-boot-kotlin/README.md
similarity index 100%
rename from spring-boot-kotlin/README.md
rename to spring-boot-modules/spring-boot-kotlin/README.md
diff --git a/spring-boot-kotlin/pom.xml b/spring-boot-modules/spring-boot-kotlin/pom.xml
similarity index 98%
rename from spring-boot-kotlin/pom.xml
rename to spring-boot-modules/spring-boot-kotlin/pom.xml
index a98d76a398..79d62645da 100644
--- a/spring-boot-kotlin/pom.xml
+++ b/spring-boot-modules/spring-boot-kotlin/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-kotlin</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../parent-kotlin</relativePath>
+        <relativePath>../../parent-kotlin</relativePath>
     </parent>
 
     <repositories>
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt b/spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt
similarity index 100%
rename from spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt
rename to spring-boot-modules/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt
diff --git a/spring-boot-kotlin/src/main/resources/application.properties b/spring-boot-modules/spring-boot-kotlin/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-kotlin/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-kotlin/src/main/resources/application.properties
diff --git a/spring-boot-kotlin/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-kotlin/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-kotlin/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-kotlin/src/main/resources/logback.xml
diff --git a/spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt b/spring-boot-modules/spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt
similarity index 100%
rename from spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt
rename to spring-boot-modules/spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt

From caceb189e7e714b88c7475eae189af357fd24402 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Tue, 28 Jan 2020 12:52:49 +0100
Subject: [PATCH 2/4] BAEL-20863 Move Spring Boot CTX Fluent module

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-ctx-fluent}/README.md                           | 0
 .../spring-boot-ctx-fluent}/pom.xml                             | 2 +-
 .../src/main/java/com/baeldung/ctx1/Ctx1Config.java             | 0
 .../src/main/java/com/baeldung/ctx1/Ctx1Controller.java         | 0
 .../src/main/java/com/baeldung/ctx1/GreetingService.java        | 0
 .../src/main/java/com/baeldung/ctx2/Ctx2Config.java             | 0
 .../src/main/java/com/baeldung/ctx2/Ctx2Controller.java         | 0
 .../src/main/java/com/baeldung/parent/App.java                  | 0
 .../src/main/java/com/baeldung/parent/HomeService.java          | 0
 .../src/main/java/com/baeldung/parent/IHomeService.java         | 0
 .../src/main/java/com/baeldung/parent/ParentConfig.java         | 0
 .../spring-boot-ctx-fluent}/src/main/resources/ctx1.properties  | 0
 .../spring-boot-ctx-fluent}/src/main/resources/ctx2.properties  | 0
 .../spring-boot-ctx-fluent}/src/main/resources/logback.xml      | 0
 .../src/test/java/org/baeldung/SpringContextTest.java           | 0
 17 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/README.md (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/pom.xml (93%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx1/Ctx1Config.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx1/Ctx1Controller.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx1/GreetingService.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx2/Ctx2Config.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx2/Ctx2Controller.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/App.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/HomeService.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/IHomeService.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/ParentConfig.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/resources/ctx1.properties (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/resources/ctx2.properties (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/resources/logback.xml (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/test/java/org/baeldung/SpringContextTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 7a26120e8e..0884608a06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,7 +650,6 @@
                 <module>spring-boot-client</module>
                 <module>spring-boot-config-jpa-error</module>
                 <module>spring-boot-crud</module>
-                <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-deployment</module>
                 <module>spring-boot-di</module>
@@ -1185,7 +1184,6 @@
                 <module>spring-boot-client</module>
                 <module>spring-boot-config-jpa-error</module>
                 <module>spring-boot-crud</module>
-                <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-deployment</module>
                 <module>spring-boot-di</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index b5fbb3c6c6..6ef64ad995 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -14,6 +14,7 @@
     </parent>
 
     <modules>
+        <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-data</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-properties</module>
diff --git a/spring-boot-ctx-fluent/README.md b/spring-boot-modules/spring-boot-ctx-fluent/README.md
similarity index 100%
rename from spring-boot-ctx-fluent/README.md
rename to spring-boot-modules/spring-boot-ctx-fluent/README.md
diff --git a/spring-boot-ctx-fluent/pom.xml b/spring-boot-modules/spring-boot-ctx-fluent/pom.xml
similarity index 93%
rename from spring-boot-ctx-fluent/pom.xml
rename to spring-boot-modules/spring-boot-ctx-fluent/pom.xml
index 782e1fd7f6..872e15d307 100644
--- a/spring-boot-ctx-fluent/pom.xml
+++ b/spring-boot-modules/spring-boot-ctx-fluent/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-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
diff --git a/spring-boot-ctx-fluent/src/main/resources/ctx1.properties b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx1.properties
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/ctx1.properties
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx1.properties
diff --git a/spring-boot-ctx-fluent/src/main/resources/ctx2.properties b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx2.properties
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/ctx2.properties
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx2.properties
diff --git a/spring-boot-ctx-fluent/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/logback.xml
diff --git a/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java

From bce1991983e1cb7568defd4f9ed58ce6f0c475f6 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Tue, 28 Jan 2020 12:52:49 +0100
Subject: [PATCH 3/4] BAEL-20863 Move Spring Boot CTX Fluent module

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-ctx-fluent}/README.md                           | 0
 .../spring-boot-ctx-fluent}/pom.xml                             | 2 +-
 .../src/main/java/com/baeldung/ctx1/Ctx1Config.java             | 0
 .../src/main/java/com/baeldung/ctx1/Ctx1Controller.java         | 0
 .../src/main/java/com/baeldung/ctx1/GreetingService.java        | 0
 .../src/main/java/com/baeldung/ctx2/Ctx2Config.java             | 0
 .../src/main/java/com/baeldung/ctx2/Ctx2Controller.java         | 0
 .../src/main/java/com/baeldung/parent/App.java                  | 0
 .../src/main/java/com/baeldung/parent/HomeService.java          | 0
 .../src/main/java/com/baeldung/parent/IHomeService.java         | 0
 .../src/main/java/com/baeldung/parent/ParentConfig.java         | 0
 .../spring-boot-ctx-fluent}/src/main/resources/ctx1.properties  | 0
 .../spring-boot-ctx-fluent}/src/main/resources/ctx2.properties  | 0
 .../spring-boot-ctx-fluent}/src/main/resources/logback.xml      | 0
 .../src/test/java/org/baeldung/SpringContextTest.java           | 0
 17 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/README.md (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/pom.xml (93%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx1/Ctx1Config.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx1/Ctx1Controller.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx1/GreetingService.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx2/Ctx2Config.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/ctx2/Ctx2Controller.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/App.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/HomeService.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/IHomeService.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/java/com/baeldung/parent/ParentConfig.java (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/resources/ctx1.properties (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/resources/ctx2.properties (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/main/resources/logback.xml (100%)
 rename {spring-boot-ctx-fluent => spring-boot-modules/spring-boot-ctx-fluent}/src/test/java/org/baeldung/SpringContextTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 7a26120e8e..0884608a06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,7 +650,6 @@
                 <module>spring-boot-client</module>
                 <module>spring-boot-config-jpa-error</module>
                 <module>spring-boot-crud</module>
-                <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-deployment</module>
                 <module>spring-boot-di</module>
@@ -1185,7 +1184,6 @@
                 <module>spring-boot-client</module>
                 <module>spring-boot-config-jpa-error</module>
                 <module>spring-boot-crud</module>
-                <module>spring-boot-ctx-fluent</module>
                 <module>spring-boot-custom-starter</module>
                 <module>spring-boot-deployment</module>
                 <module>spring-boot-di</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index b5fbb3c6c6..6ef64ad995 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -14,6 +14,7 @@
     </parent>
 
     <modules>
+        <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-data</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-properties</module>
diff --git a/spring-boot-ctx-fluent/README.md b/spring-boot-modules/spring-boot-ctx-fluent/README.md
similarity index 100%
rename from spring-boot-ctx-fluent/README.md
rename to spring-boot-modules/spring-boot-ctx-fluent/README.md
diff --git a/spring-boot-ctx-fluent/pom.xml b/spring-boot-modules/spring-boot-ctx-fluent/pom.xml
similarity index 93%
rename from spring-boot-ctx-fluent/pom.xml
rename to spring-boot-modules/spring-boot-ctx-fluent/pom.xml
index 782e1fd7f6..872e15d307 100644
--- a/spring-boot-ctx-fluent/pom.xml
+++ b/spring-boot-modules/spring-boot-ctx-fluent/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-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Config.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/Ctx1Controller.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx1/GreetingService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Config.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/ctx2/Ctx2Controller.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/App.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/HomeService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/IHomeService.java
diff --git a/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java b/spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/java/com/baeldung/parent/ParentConfig.java
diff --git a/spring-boot-ctx-fluent/src/main/resources/ctx1.properties b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx1.properties
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/ctx1.properties
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx1.properties
diff --git a/spring-boot-ctx-fluent/src/main/resources/ctx2.properties b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx2.properties
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/ctx2.properties
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/ctx2.properties
diff --git a/spring-boot-ctx-fluent/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/logback.xml
similarity index 100%
rename from spring-boot-ctx-fluent/src/main/resources/logback.xml
rename to spring-boot-modules/spring-boot-ctx-fluent/src/main/resources/logback.xml
diff --git a/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-boot-modules/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java

From 5035a311dd47a10dbdcab8d295f2da2a3b741072 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sat, 1 Feb 2020 20:24:02 +0530
Subject: [PATCH 4/4] Jcenter URL update

- Updating the JCenter repository url as it has now moved from http to https
---
 parent-kotlin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index 111de474b9..abc871ca91 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -16,7 +16,7 @@
     <repositories>
         <repository>
             <id>jcenter</id>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
         <repository>
             <id>kotlin-ktor</id>