[CLIENT] Update log4j because of the CVE-2021-44228 security flaw

14 files changed, 42 insertions, 28 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java
index 6e94735d..c64fbfca 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java
@@ -11,7 +11,8 @@ import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.SatelliteUserConfig;
 import org.openslx.dozmod.Config;
@@ -34,7 +35,7 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti
 	 */
 	private static final long serialVersionUID = 1528773221604107054L;
 
-	private final static Logger LOGGER = Logger.getLogger(ConfigWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(ConfigWindow.class);
 	private SatelliteUserConfig userConfig = null;
 	private JRadioButton selectedLookAndFeel = null;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
index 5307a871..97128e75 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
@@ -11,7 +11,8 @@ import java.security.NoSuchAlgorithmException;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.util.ResourceLoader;
@@ -26,7 +27,7 @@ public class DisclaimerWindow extends GenericNoticeWindow implements UiFeedback
 	 */
 	private static final long serialVersionUID = 8479978304760663L;
 
-	private final static Logger LOGGER = Logger.getLogger(PrivacyNoticeWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(PrivacyNoticeWindow.class);
 
 	final DisclaimerWindow me = this;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java
index 42f9758d..7b39998f 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java
@@ -11,7 +11,8 @@ import java.awt.event.WindowEvent;
 import javax.swing.JFrame;
 import javax.swing.JScrollBar;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.helper.MessageType;
@@ -30,7 +31,7 @@ public abstract class GenericNoticeWindow extends GenericNoticeWindowLayout impl
 
 	final GenericNoticeWindow me = this;
 
-	private final static Logger LOGGER = Logger.getLogger(GenericNoticeWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(GenericNoticeWindow.class);
 	private boolean shouldBeShown = true;
 
 	public GenericNoticeWindow(Frame modalParent, boolean shouldBeShown) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 8d31798f..0d63dcb4 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -24,7 +24,8 @@ import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.*;
 import org.openslx.dozmod.Branding;
@@ -71,7 +72,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout
 	 */
 	private static final long serialVersionUID = -1901954219828374015L;
 
-	private static final Logger LOGGER = Logger.getLogger(ImageDetailsWindow.class);
+	private static final Logger LOGGER = LogManager.getLogger(ImageDetailsWindow.class);
 
 	/**
 	 * Self-reference
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index bc30c3c5..9434ad25 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -19,7 +19,8 @@ import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
@@ -53,7 +54,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	 */
 	private static final long serialVersionUID = 84238230133246131L;
 
-	private final static Logger LOGGER = Logger.getLogger(ImageListWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(ImageListWindow.class);
 
 	/**
 	 * Self-reference
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
index a04d09c9..4c2d4f7c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
@@ -22,7 +22,8 @@ import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.Organization;
@@ -57,7 +58,7 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 	 */
 	private static final long serialVersionUID = 7455819819182519090L;
 
-	private final static Logger LOGGER = Logger.getLogger(ImagePublishedWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(ImagePublishedWindow.class);
 	private final ImagePublishedWindow me = this;
 
 	// Filtering: matches against image's name, user's first/last name or email and organisation name of the owner
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java
index 2980b03c..52c333d2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java
@@ -13,7 +13,8 @@ import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
@@ -35,7 +36,7 @@ public class LectureChangeImage extends LectureChangeImageLayout implements UiFe
 	 */
 	private static final long serialVersionUID = 3558697767037191501L;
 
-	private static final Logger LOGGER = Logger.getLogger(LectureChangeImage.class);
+	private static final Logger LOGGER = LogManager.getLogger(LectureChangeImage.class);
 
 	private boolean okUsed = false;
 	private ImageTable imageTable;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index 11c0d605..1bf231f2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -1,6 +1,7 @@
 package org.openslx.dozmod.gui.window;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.*;
 import org.openslx.dozmod.gui.Gui;
@@ -51,7 +52,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 	 */
 	private static final long serialVersionUID = -2190481933307215137L;
 
-	private static final Logger LOGGER = Logger.getLogger(LectureDetailsWindow.class);
+	private static final Logger LOGGER = LogManager.getLogger(LectureDetailsWindow.class);
 
 	/**
 	 * Self-reference
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
index e45fcac8..499d1e37 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
@@ -26,7 +26,8 @@ import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
@@ -64,7 +65,7 @@ public class LectureListWindow extends LectureListWindowLayout {
 	 */
 	private static final long serialVersionUID = 3135935034893934652L;
 
-	private final static Logger LOGGER = Logger.getLogger(LectureListWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(LectureListWindow.class);
 
 	public final LectureListWindow me = this;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index ba91b0f0..eab1c4f9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -19,7 +19,8 @@ import javax.swing.JFrame;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TBaseHelper;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.Organization;
@@ -63,7 +64,7 @@ public class LoginWindow extends LoginWindowLayout {
 	 */
 	private static final long serialVersionUID = 3826201134186162076L;
 
-	private final static Logger LOGGER = Logger.getLogger(LoginWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(LoginWindow.class);
 
 	public static enum LoginType {
 		ECP(0),
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java
index 03a4c790..0ed4ee53 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java
@@ -11,7 +11,8 @@ import java.security.NoSuchAlgorithmException;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.util.ResourceLoader;
@@ -26,7 +27,7 @@ public class PrivacyNoticeWindow extends GenericNoticeWindow implements UiFeedba
 	 */
 	private static final long serialVersionUID = -7356663101779860276L;
 
-	private final static Logger LOGGER = Logger.getLogger(PrivacyNoticeWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(PrivacyNoticeWindow.class);
 
 	final PrivacyNoticeWindow me = this;
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
index 3fccf3dd..1818323d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
@@ -13,7 +13,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.TreeSet;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.helper.MessageType;
@@ -36,7 +37,7 @@ public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout impleme
 	 */
 	private static final long serialVersionUID = 8416526255408870346L;
 
-	private final static Logger LOGGER = Logger.getLogger(VirtConfigEditorWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(VirtConfigEditorWindow.class);
 
 	public interface VirtConfigChanged {
 		public void virtConfigChanged(String newVmx);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
index 46bc032c..44544ed1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
@@ -23,7 +23,8 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
@@ -58,7 +59,7 @@ public class VirtDropDownConfigEditorWindow extends JDialog
 	 */
 	private static final long serialVersionUID = 230794205942072411L;
 
-	private final static Logger LOGGER = Logger.getLogger(VirtDropDownConfigEditorWindow.class);
+	private final static Logger LOGGER = LogManager.getLogger(VirtDropDownConfigEditorWindow.class);
 
 	public interface VirtConfigChanged {
 		public void virtConfigChanged(String newVmx);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index d68ebba4..55b525d9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -18,7 +18,8 @@ import javax.swing.JSeparator;
 import javax.swing.JTextField;
 import javax.swing.border.TitledBorder;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.Organization;
 import org.openslx.dozmod.Branding;
 import org.openslx.dozmod.gui.Gui;
@@ -36,7 +37,7 @@ public abstract class LoginWindowLayout extends JDialog {
 	 */
 	private static final long serialVersionUID = 4666636501698824636L;
 
-	private static final Logger LOGGER = Logger.getLogger(LoginWindowLayout.class);
+	private static final Logger LOGGER = LogManager.getLogger(LoginWindowLayout.class);
 
 	// TODO This has nothing to to with the layout
 	protected static enum LOGIN_TYPE {