Update log4j because of the CVE-2021-44228 security flaw

7 files changed, 19 insertions, 13 deletions

diff --git a/src/main/java/org/openslx/util/AppUtil.java b/src/main/java/org/openslx/util/AppUtil.java
index c782cae..0ef4d8e 100644
--- a/src/main/java/org/openslx/util/AppUtil.java
+++ b/src/main/java/org/openslx/util/AppUtil.java
@@ -11,7 +11,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
 
 public class AppUtil
 {
diff --git a/src/main/java/org/openslx/util/FsUtil.java b/src/main/java/org/openslx/util/FsUtil.java
index 76571ef..3f9731a 100644
--- a/src/main/java/org/openslx/util/FsUtil.java
+++ b/src/main/java/org/openslx/util/FsUtil.java
@@ -2,12 +2,13 @@ package org.openslx.util;
 
 import java.io.File;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class FsUtil
 {
 	
-	private static final Logger LOGGER = Logger.getLogger( FsUtil.class );
+	private static final Logger LOGGER = LogManager.getLogger( FsUtil.class );
 
 	public static String getRelativePath( File absolutePath, File parentDir )
 	{
diff --git a/src/main/java/org/openslx/util/GenericDataCache.java b/src/main/java/org/openslx/util/GenericDataCache.java
index 5ae73fb..a7116b7 100644
--- a/src/main/java/org/openslx/util/GenericDataCache.java
+++ b/src/main/java/org/openslx/util/GenericDataCache.java
@@ -2,12 +2,13 @@ package org.openslx.util;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public abstract class GenericDataCache<T>
 {
 
-	private static final Logger LOGGER = Logger.getLogger( GenericDataCache.class );
+	private static final Logger LOGGER = LogManager.getLogger( GenericDataCache.class );
 
 	/**
 	 * How long the cached data is valid after fetching
diff --git a/src/main/java/org/openslx/util/Json.java b/src/main/java/org/openslx/util/Json.java
index ab0087e..5e5fbcb 100644
--- a/src/main/java/org/openslx/util/Json.java
+++ b/src/main/java/org/openslx/util/Json.java
@@ -8,7 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TBase;
 
 import com.google.gson.Gson;
@@ -25,7 +26,7 @@ import com.google.gson.JsonSyntaxException;
 
 public class Json {
 
-	private static final Logger LOGGER = Logger.getLogger(Json.class);
+	private static final Logger LOGGER = LogManager.getLogger(Json.class);
 
 	/**
 	 * Global static instance. The Gson object is thread-safe.
diff --git a/src/main/java/org/openslx/util/QuickTimer.java b/src/main/java/org/openslx/util/QuickTimer.java
index ec7c2ed..a26fd76 100644
--- a/src/main/java/org/openslx/util/QuickTimer.java
+++ b/src/main/java/org/openslx/util/QuickTimer.java
@@ -3,7 +3,8 @@ package org.openslx.util;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * This is a global, static {@link Timer} you can use anywhere for repeating
@@ -15,7 +16,7 @@ import org.apache.log4j.Logger;
  */
 public class QuickTimer {
 	
-	private static final Logger LOGGER = Logger.getLogger(QuickTimer.class);
+	private static final Logger LOGGER = LogManager.getLogger(QuickTimer.class);
 
 	private static final Timer timer = new Timer("QuickTimer", true);
 
diff --git a/src/main/java/org/openslx/util/Util.java b/src/main/java/org/openslx/util/Util.java
index 441bc88..f475d01 100644
--- a/src/main/java/org/openslx/util/Util.java
+++ b/src/main/java/org/openslx/util/Util.java
@@ -2,11 +2,12 @@ package org.openslx.util;
 
 import java.util.regex.Pattern;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Util
 {
-	private static Logger log = Logger.getLogger( Util.class );
+	private static Logger log = LogManager.getLogger( Util.class );
 
 	/**
 	 * Check if the given object is null, abort program if true. An optional
diff --git a/src/main/java/org/openslx/util/XmlHelper.java b/src/main/java/org/openslx/util/XmlHelper.java
index 6039b7b..e3607d9 100644
--- a/src/main/java/org/openslx/util/XmlHelper.java
+++ b/src/main/java/org/openslx/util/XmlHelper.java
@@ -20,7 +20,8 @@ import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -28,7 +29,7 @@ import org.xml.sax.SAXException;
 
 public class XmlHelper
 {
-	private final static Logger LOGGER = Logger.getLogger( XmlHelper.class );
+	private final static Logger LOGGER = LogManager.getLogger( XmlHelper.class );
 
 	// TODO check thread-safety
 	private static final XPath XPath = XPathFactory.newInstance().newXPath();