From 2acd856c4cf1bcf8cc60a2852d0a548e49ec91b0 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 15 Dec 2021 14:36:57 +0100
Subject: Update log4j because of the CVE-2021-44228 security flaw

---
 src/main/java/org/openslx/filetransfer/ClassTest.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/main/java/org/openslx/filetransfer/ClassTest.java')

diff --git a/src/main/java/org/openslx/filetransfer/ClassTest.java b/src/main/java/org/openslx/filetransfer/ClassTest.java
index 9d5bc82..04dc40d 100644
--- a/src/main/java/org/openslx/filetransfer/ClassTest.java
+++ b/src/main/java/org/openslx/filetransfer/ClassTest.java
@@ -28,8 +28,8 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
-import org.apache.log4j.BasicConfigurator;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.DefaultConfiguration;
 
 public class ClassTest
 {
@@ -39,15 +39,10 @@ public class ClassTest
 	private static String inFile;
 	private static String outFile;
 
-	static {
-		// This is a temporary workaround for this annoying log4j error msg.
-		// Initializing the logger before anything else is done.
-		BasicConfigurator.configure();
-		LoggerFactory.getLogger( "ROOT" );
-	}
-
 	public static void main( String[] args ) throws Exception
 	{
+		Configurator.initialize(new DefaultConfiguration());
+
 		if ( args.length != 4 ) {
 			System.out.println( "Need 4 argument: <keystore> <passphrase> <infile> <outfile>" );
 			System.exit( 1 );
-- 
cgit v1.2.3-55-g7522