From 4a25d3463bd8dcb670331f55a7a7954235a08b19 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Wed, 7 Oct 2020 22:43:54 +0200
Subject: [PATCH] DATAES-944 - Simplify logging setup in test environment.

Original PR: #532
---
 pom.xml                        | 13 +++++++------
 src/test/resources/log4j2.xml  | 16 ----------------
 src/test/resources/logback.xml | 10 ++++++++--
 3 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 src/test/resources/log4j2.xml

diff --git a/pom.xml b/pom.xml
index 48e8b27ba..a9571e72a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,12 +154,6 @@
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>transport</artifactId>
 			<version>${elasticsearch}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -227,6 +221,13 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-to-slf4j</artifactId>
+			<version>${log4j}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml
deleted file mode 100644
index 326e48951..000000000
--- a/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-		<Logger name="org.springframework.web" level="INFO"/>
-		<Logger name="org.apache.http" level="INFO"/>
-		<Logger name="org.apache.http.wire" level="INFO"/>
-        <Root level="error">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 7a6440457..3fcfec056 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -7,16 +7,22 @@
 		</encoder>
 	</appender>
 
+	<logger name="org.apache.http" level="info"/>
+	<logger name="org.apache.http.wire" level="info"/>
+
 	<logger name="org.springframework.data.elasticsearch.support.VersionInfo" level="info"/>
 	<logger name="org.springframework.data.elasticsearch.junit" level="debug"/>
 	<logger name="org.springframework.data.elasticsearch.junit.junit4.ElasticsearchVersionRule" level="info"/>
 	<logger name="org.springframework.data.elasticsearch.client.WIRE" level="info"/>
 
+	<logger name="org.springframework.web" level="info"/>
+
+	<logger name="com.github.dockerjava" level="WARN"/>
+	<logger name="org.testcontainers" level="INFO"/>
+
 	<root level="error">
 		<appender-ref ref="console"/>
 	</root>
 
-	<logger name="org.testcontainers" level="INFO"/>
-	<logger name="com.github.dockerjava" level="WARN"/>
 
 </configuration>