From defaf43a4c27ca62b9ec8db5749ef4a6f80fc719 Mon Sep 17 00:00:00 2001
From: Stefaan Dutry <stefaan.dutry@gmail.com>
Date: Fri, 21 Apr 2017 23:49:43 +0200
Subject: [PATCH] WW-4780 fixed logging in the struts2-cdi-plugin tests

---
 plugins/cdi/pom.xml                             |  5 +++--
 plugins/cdi/src/test/resources/log4j.properties | 11 -----------
 plugins/cdi/src/test/resources/log4j2.xml       | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 plugins/cdi/src/test/resources/log4j.properties
 create mode 100644 plugins/cdi/src/test/resources/log4j2.xml

diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index fee24ca4c..90239f3eb 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -59,8 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/cdi/src/test/resources/log4j.properties b/plugins/cdi/src/test/resources/log4j.properties
deleted file mode 100644
index 77d993906..000000000
--- a/plugins/cdi/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set root logger level to WARN and append to stdout
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
-
-# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=FATAL
diff --git a/plugins/cdi/src/test/resources/log4j2.xml b/plugins/cdi/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..3edabe1bf
--- /dev/null
+++ b/plugins/cdi/src/test/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="STDOUT" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d %5p (%c:%L) - %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="noModule" level="fatal"/>
+        <Root level="info">
+            <AppenderRef ref="STDOUT"/>
+        </Root>
+    </Loggers>
+</Configuration>