diff --git a/pom.xml b/pom.xml index 0cabef0a6989b2d76ba19449044cef95c6c28765..c27a412484708c1f190e6516ee4b5ae3656e7a63 100644 --- a/pom.xml +++ b/pom.xml @@ -150,12 +150,24 @@ 1.4 - + + + + + org.apache.logging.log4j + log4j-core + 2.15.0 + + + - log4j - log4j - 1.2.16 + org.apache.logging.log4j + log4j-api + 2.15.0 + + + org.slf4j diff --git a/src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java b/src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java index a7e2042a25de9528f54758e5609d83baa62acf49..a4982dd7a5893e45dbc4951b54f3145e7e5b1358 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 57ca69db1baef9b38f78fcf085abc23c1f4fc683..be54f1c06957a0f06e95222fd91a2e0f33c0bc3f 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() {