From 1646eb9813c3b4f6e0e52f26c39f7591d0205aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20R=C3=A4del?= <ducks.2788@gmail.com>
Date: Fri, 28 Oct 2016 21:04:41 +0200
Subject: [PATCH] BAEL-41: Moved module location.

---
 {logging/log4j2 => log4j2}/pom.xml            | 32 ++++++++-------
 .../AsyncFileAppenderUsingJsonLayoutTest.java |  0
 ...ConsoleAppenderUsingDefaultLayoutTest.java |  0
 ...enderUsingPatternLayoutWithColorsTest.java |  0
 .../FailoverSyslogConsoleAppenderTest.java    |  0
 .../log4j2/tests/JDBCAppenderTest.java        |  0
 ...RollingFileAppenderUsingXMLLayoutTest.java |  2 +-
 .../log4j2/tests/jdbc/ConnectionFactory.java  |  0
 ...log4j2-async-file-appender_json-layout.xml |  0
 ...log4j2-console-appender_pattern-layout.xml |  0
 ...syslog-console-appender_pattern-layout.xml |  0
 ...onsole-appender_pattern-layout_colored.xml |  0
 .../test/resources/log4j2-jdbc-appender.xml   |  0
 ...og4j2-rolling-file-appender_xml-layout.xml |  0
 .../src/test/resources/log4j2.xml             |  0
 logging/pom.xml                               | 40 -------------------
 16 files changed, 18 insertions(+), 56 deletions(-)
 rename {logging/log4j2 => log4j2}/pom.xml (80%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/AsyncFileAppenderUsingJsonLayoutTest.java (100%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingDefaultLayoutTest.java (100%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java (100%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/FailoverSyslogConsoleAppenderTest.java (100%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/JDBCAppenderTest.java (100%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java (98%)
 rename {logging/log4j2 => log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2-async-file-appender_json-layout.xml (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2-console-appender_pattern-layout.xml (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2-failover-syslog-console-appender_pattern-layout.xml (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2-jdbc-appender.xml (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2-rolling-file-appender_xml-layout.xml (100%)
 rename {logging/log4j2 => log4j2}/src/test/resources/log4j2.xml (100%)
 delete mode 100644 logging/pom.xml

diff --git a/logging/log4j2/pom.xml b/log4j2/pom.xml
similarity index 80%
rename from logging/log4j2/pom.xml
rename to log4j2/pom.xml
index d386836b6c..83904f2075 100644
--- a/logging/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -2,40 +2,37 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>logging</artifactId>
-        <groupId>com.baeldung.logging</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>log4j2</artifactId>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
     <dependencies>
-        <!-- These two are the needed core components. -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.6.2</version>
-        </dependency>
+        <!-- This is the needed core component. -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.6.2</version>
+            <version>2.7</version>
         </dependency>
 
         <!-- This is used by JSONLayout. -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.2</version>
+            <version>2.8.4</version>
         </dependency>
 
         <!-- This is used by XMLLayout. -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.8.2</version>
+            <version>2.8.4</version>
         </dependency>
 
         <!-- This is used by JDBC Appender. -->
@@ -54,7 +51,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.6.2</version>
+            <version>2.7</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -71,6 +68,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/AsyncFileAppenderUsingJsonLayoutTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/AsyncFileAppenderUsingJsonLayoutTest.java
similarity index 100%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/AsyncFileAppenderUsingJsonLayoutTest.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/AsyncFileAppenderUsingJsonLayoutTest.java
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingDefaultLayoutTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingDefaultLayoutTest.java
similarity index 100%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingDefaultLayoutTest.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingDefaultLayoutTest.java
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java
similarity index 100%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/FailoverSyslogConsoleAppenderTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/FailoverSyslogConsoleAppenderTest.java
similarity index 100%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/FailoverSyslogConsoleAppenderTest.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/FailoverSyslogConsoleAppenderTest.java
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/JDBCAppenderTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/JDBCAppenderTest.java
similarity index 100%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/JDBCAppenderTest.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/JDBCAppenderTest.java
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java
similarity index 98%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java
index f455003b08..2ebdccfc75 100644
--- a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java
+++ b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/RollingFileAppenderUsingXMLLayoutTest.java
@@ -24,7 +24,7 @@ public class RollingFileAppenderUsingXMLLayoutTest {
         Logger logger = contextRule.getLogger(getClass().getSimpleName());
         final int count = 88;
         for (int i = 0; i < count; i++) {
-            logger.info("This is rolling file XML message #{} at INFO level.", count);
+            logger.info("This is rolling file XML message #{} at INFO level.", i);
         }
         String[] logEvents = Files.readAllLines(Paths.get("target/logfile.xml")).stream()
           .collect(Collectors.joining(System.lineSeparator()))
diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
similarity index 100%
rename from logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
diff --git a/logging/log4j2/src/test/resources/log4j2-async-file-appender_json-layout.xml b/log4j2/src/test/resources/log4j2-async-file-appender_json-layout.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2-async-file-appender_json-layout.xml
rename to log4j2/src/test/resources/log4j2-async-file-appender_json-layout.xml
diff --git a/logging/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml b/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml
rename to log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml
diff --git a/logging/log4j2/src/test/resources/log4j2-failover-syslog-console-appender_pattern-layout.xml b/log4j2/src/test/resources/log4j2-failover-syslog-console-appender_pattern-layout.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2-failover-syslog-console-appender_pattern-layout.xml
rename to log4j2/src/test/resources/log4j2-failover-syslog-console-appender_pattern-layout.xml
diff --git a/logging/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml b/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
rename to log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
diff --git a/logging/log4j2/src/test/resources/log4j2-jdbc-appender.xml b/log4j2/src/test/resources/log4j2-jdbc-appender.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2-jdbc-appender.xml
rename to log4j2/src/test/resources/log4j2-jdbc-appender.xml
diff --git a/logging/log4j2/src/test/resources/log4j2-rolling-file-appender_xml-layout.xml b/log4j2/src/test/resources/log4j2-rolling-file-appender_xml-layout.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2-rolling-file-appender_xml-layout.xml
rename to log4j2/src/test/resources/log4j2-rolling-file-appender_xml-layout.xml
diff --git a/logging/log4j2/src/test/resources/log4j2.xml b/log4j2/src/test/resources/log4j2.xml
similarity index 100%
rename from logging/log4j2/src/test/resources/log4j2.xml
rename to log4j2/src/test/resources/log4j2.xml
diff --git a/logging/pom.xml b/logging/pom.xml
deleted file mode 100644
index 535c9e1c54..0000000000
--- a/logging/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung.logging</groupId>
-    <artifactId>logging</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <modules>
-        <module>log4j2</module>
-    </modules>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>