From 50005ad83a33eb439d2b292ebedcf667495985af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <dominique.eiflaender@knecon.com>
Date: Mon, 9 Oct 2023 15:02:56 +0200
Subject: [PATCH] RED-7715: Fixed messed up logging

---
 .../persistence-service-processor-v1/pom.xml      | 15 ++-------------
 .../persistence-service-server-v1/pom.xml         |  9 ++++++++-
 .../src/main/resources/log4j2.xml                 |  5 ++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/pom.xml b/persistence-service-v1/persistence-service-processor-v1/pom.xml
index 95c095dc3..f635cef86 100644
--- a/persistence-service-v1/persistence-service-processor-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-processor-v1/pom.xml
@@ -221,14 +221,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>logging-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -276,11 +269,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.yannbriancon</groupId>
             <artifactId>spring-hibernate-query-utils</artifactId>
diff --git a/persistence-service-v1/persistence-service-server-v1/pom.xml b/persistence-service-v1/persistence-service-server-v1/pom.xml
index e82f7af6f..33e8387d7 100644
--- a/persistence-service-v1/persistence-service-server-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-server-v1/pom.xml
@@ -13,7 +13,6 @@
 
     <artifactId>persistence-service-server-v1</artifactId>
     <properties>
-        <slf4j.version>1.7.30</slf4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -91,6 +90,14 @@
 
     </dependencies>
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <plugins>
 
             <plugin>
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/log4j2.xml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/log4j2.xml
index de2e26b75..7cdd0cd0c 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/log4j2.xml
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/log4j2.xml
@@ -4,8 +4,7 @@
         <Console name="JsonConsole" target="SYSTEM_OUT">
             <JSONLayout compact="true" eventEol="true" properties="true" stacktraceAsString="true"
                         includeTimeMillis="true">
-                <!--  Project properties -->
-                <KeyValuePair key="appName" value="${project.name}"/>
+                
                 <KeyValuePair key="version" value="${project.version}"/>
             </JSONLayout>
         </Console>
@@ -15,4 +14,4 @@
             <AppenderRef ref="JsonConsole"/>
         </Root>
     </Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
-- 
2.47.2