From cce61b0d53864f3b1465cd4a1527627d43df10f2 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Fri, 31 Jan 2020 08:38:03 +0100
Subject: [PATCH] BAEL-20875: Move spring-boot-logging-log4j2 into
 spring-boot-modules

---
 pom.xml                                                         | 2 --
 spring-boot-modules/pom.xml                                     | 1 +
 .../spring-boot-logging-log4j2}/.gitignore                      | 0
 .../spring-boot-logging-log4j2}/README.md                       | 0
 .../spring-boot-logging-log4j2}/pom.xml                         | 2 +-
 .../main/java/com/baeldung/graylog/GraylogDemoApplication.java  | 0
 .../java/com/baeldung/springbootlogging/LoggingController.java  | 0
 .../com/baeldung/springbootlogging/LombokLoggingController.java | 0
 .../springbootlogging/SpringBootLoggingApplication.java         | 0
 .../src/main/resources/application.properties                   | 0
 .../spring-boot-logging-log4j2}/src/main/resources/log4j.xml    | 0
 .../src/main/resources/log4j2-spring.xml                        | 0
 .../src/test/java/org/baeldung/SpringContextTest.java           | 0
 13 files changed, 2 insertions(+), 3 deletions(-)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/.gitignore (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/README.md (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/pom.xml (98%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/java/com/baeldung/graylog/GraylogDemoApplication.java (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/java/com/baeldung/springbootlogging/LoggingController.java (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/java/com/baeldung/springbootlogging/SpringBootLoggingApplication.java (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/resources/application.properties (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/resources/log4j.xml (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/main/resources/log4j2-spring.xml (100%)
 rename {spring-boot-logging-log4j2 => spring-boot-modules/spring-boot-logging-log4j2}/src/test/java/org/baeldung/SpringContextTest.java (100%)

diff --git a/pom.xml b/pom.xml
index a8efad57fa..3d650a1c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -655,7 +655,6 @@
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-kotlin</module>
                 <module>spring-boot-libraries</module>
-                <module>spring-boot-logging-log4j2</module>
                 <module>spring-boot-mvc-2</module>
                 <module>spring-boot-nashorn</module>
                 <module>spring-boot-parent</module>
@@ -1182,7 +1181,6 @@
                 <module>spring-boot-jasypt</module>
                 <module>spring-boot-kotlin</module>
                 <module>spring-boot-libraries</module>
-                <module>spring-boot-logging-log4j2</module>
                 <module>spring-boot-mvc</module>
                 <module>spring-boot-mvc-2</module>
                 <module>spring-boot-nashorn</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index a3532dba2c..22ef579780 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -21,6 +21,7 @@
         <module>spring-boot-data</module>
         <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
         <module>spring-boot-keycloak</module>
+        <module>spring-boot-logging-log4j2</module>
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-performance</module>
         <module>spring-boot-properties</module>
diff --git a/spring-boot-logging-log4j2/.gitignore b/spring-boot-modules/spring-boot-logging-log4j2/.gitignore
similarity index 100%
rename from spring-boot-logging-log4j2/.gitignore
rename to spring-boot-modules/spring-boot-logging-log4j2/.gitignore
diff --git a/spring-boot-logging-log4j2/README.md b/spring-boot-modules/spring-boot-logging-log4j2/README.md
similarity index 100%
rename from spring-boot-logging-log4j2/README.md
rename to spring-boot-modules/spring-boot-logging-log4j2/README.md
diff --git a/spring-boot-logging-log4j2/pom.xml b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
similarity index 98%
rename from spring-boot-logging-log4j2/pom.xml
rename to spring-boot-modules/spring-boot-logging-log4j2/pom.xml
index a7065bc925..6e709230dd 100644
--- a/spring-boot-logging-log4j2/pom.xml
+++ b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.1.RELEASE</version>
+        <version>2.2.2.RELEASE</version>
     </parent>
 
     <dependencies>
diff --git a/spring-boot-logging-log4j2/src/main/java/com/baeldung/graylog/GraylogDemoApplication.java b/spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/graylog/GraylogDemoApplication.java
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/java/com/baeldung/graylog/GraylogDemoApplication.java
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/graylog/GraylogDemoApplication.java
diff --git a/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LoggingController.java b/spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LoggingController.java
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LoggingController.java
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LoggingController.java
diff --git a/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java b/spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java
diff --git a/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/SpringBootLoggingApplication.java b/spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/SpringBootLoggingApplication.java
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/SpringBootLoggingApplication.java
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/SpringBootLoggingApplication.java
diff --git a/spring-boot-logging-log4j2/src/main/resources/application.properties b/spring-boot-modules/spring-boot-logging-log4j2/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/resources/application.properties
diff --git a/spring-boot-logging-log4j2/src/main/resources/log4j.xml b/spring-boot-modules/spring-boot-logging-log4j2/src/main/resources/log4j.xml
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/resources/log4j.xml
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/resources/log4j.xml
diff --git a/spring-boot-logging-log4j2/src/main/resources/log4j2-spring.xml b/spring-boot-modules/spring-boot-logging-log4j2/src/main/resources/log4j2-spring.xml
similarity index 100%
rename from spring-boot-logging-log4j2/src/main/resources/log4j2-spring.xml
rename to spring-boot-modules/spring-boot-logging-log4j2/src/main/resources/log4j2-spring.xml
diff --git a/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-boot-modules/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java