From 189285b2f0eb0d66f1aa48ab2f4c10fa33981421 Mon Sep 17 00:00:00 2001
From: Julian Zobel <julian.zobel@kom.tu-darmstadt.de>
Date: Mon, 13 Dec 2021 09:52:55 +0100
Subject: [PATCH] Upgrade Log4j to current 2.15.0 version.

(cherry picked from commit d0bac56c317237af0b951a52cf852f64a546a2fb)
---
 pom.xml                                       | 20 +++++++++++++++----
 .../p2psim/impl/common/DefaultMonitor.java    |  5 +++--
 .../utils/SimCfgExpressionExecutor.java       |  6 ++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cabef0a..c27a4124 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,12 +150,24 @@
 			<version>1.4</version>
 		</dependency>
 
-		<!-- Logging -->		
+			
+		<!-- Logging with Log4j -->
+		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
+		<dependency>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-core</artifactId>
+		    <version>2.15.0</version>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-api</artifactId>
+		    <version>2.15.0</version>
 		</dependency>
+
+		
+		
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
 		<dependency>
 		    <groupId>org.slf4j</groupId>
diff --git a/src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java b/src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java
index a7e2042a..a4982dd7 100644
--- a/src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java
+++ b/src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java
@@ -29,7 +29,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import de.tud.kom.p2psim.api.simengine.SimulatorObserver;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
@@ -94,7 +95,7 @@ public class DefaultMonitor implements MonitorComponent, EventHandler,
 	public void log(Class<?> subject, Level level, String msg, Object... data) {
 		Logger log = loggers.get(subject);
 		if (log == null) {
-			log = Logger.getLogger(subject);
+			log = LogManager.getLogger(subject);
 			loggers.put(subject, log);
 		}
 		switch (level) {
diff --git a/src/de/tud/kom/p2psim/impl/scenario/simcfg2/utils/SimCfgExpressionExecutor.java b/src/de/tud/kom/p2psim/impl/scenario/simcfg2/utils/SimCfgExpressionExecutor.java
index 57ca69db..be54f1c0 100644
--- a/src/de/tud/kom/p2psim/impl/scenario/simcfg2/utils/SimCfgExpressionExecutor.java
+++ b/src/de/tud/kom/p2psim/impl/scenario/simcfg2/utils/SimCfgExpressionExecutor.java
@@ -20,7 +20,9 @@
 package de.tud.kom.p2psim.impl.scenario.simcfg2.utils;
 
 import de.tud.kom.p2psim.impl.scenario.simcfg2.configuration.SimCfgConfiguration;
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import javax.script.*;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Map;
  * @version 1.0, 12.07.13
  */
 public class SimCfgExpressionExecutor {
-    private static final Logger log = Logger.getLogger(SimCfgExpressionExecutor.class);
+    private static final Logger log = LogManager.getLogger(SimCfgExpressionExecutor.class);
     private ScriptEngine javascriptEngine = null;
 
     public SimCfgExpressionExecutor() {
-- 
GitLab