From 932f537231cba02c9f08558475e6aea5a1c5d838 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 16 Dec 2021 07:56:00 +0100
Subject: Update log4j because of the CVE-2021-44228 security flaw

---
 .../main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java | 5 +++--
 .../main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java | 5 +++--
 .../src/main/java/org/openslx/taskmanager/network/RequestParser.java | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'daemon/src/main/java/org/openslx/taskmanager/network')

diff --git a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java
index 4b69e55..6492f2e 100644
--- a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java
+++ b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java
@@ -14,7 +14,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.taskmanager.Global;
 
 /**
@@ -24,7 +25,7 @@ import org.openslx.taskmanager.Global;
 public class NetworkHandlerTcp extends NetworkHandlerBase
 {
 
-	private static final Logger log = Logger.getLogger( NetworkHandlerTcp.class );
+	private static final Logger log = LogManager.getLogger( NetworkHandlerTcp.class );
 
 	/**
 	 * UDP socket for sending and receiving.
diff --git a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java
index 7a25ed1..767e6a4 100644
--- a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java
+++ b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java
@@ -10,7 +10,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.taskmanager.Global;
 
 /**
@@ -20,7 +21,7 @@ import org.openslx.taskmanager.Global;
 public class NetworkHandlerUdp extends NetworkHandlerBase
 {
 
-	private static final Logger log = Logger.getLogger( NetworkHandlerUdp.class );
+	private static final Logger log = LogManager.getLogger( NetworkHandlerUdp.class );
 
 	private Thread sendThread = null;
 	/**
diff --git a/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java b/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java
index 55a44a5..09b94ce 100644
--- a/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java
+++ b/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java
@@ -3,7 +3,8 @@ package org.openslx.taskmanager.network;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.Deflater;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.taskmanager.api.BoundedLog;
 import org.openslx.taskmanager.api.TaskStatus;
 import org.openslx.taskmanager.main.Taskmanager;
@@ -14,7 +15,7 @@ import com.google.gson.GsonBuilder;
 
 public class RequestParser
 {
-	private static final Logger log = Logger.getLogger( RequestParser.class );
+	private static final Logger log = LogManager.getLogger( RequestParser.class );
 
 	/**
 	 * Our very own gson instance (for serializing replies)
-- 
cgit v1.2.3-55-g7522