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 --- .../configuration/VirtualizationConfigurationQemuTest.java | 6 +++--- .../configuration/VirtualizationConfigurationVirtualBoxTest.java | 6 +++--- .../logic/ConfigurationLogicDozModClientToDozModServerTest.java | 6 +++--- .../logic/ConfigurationLogicDozModServerToDozModClientTest.java | 6 +++--- .../logic/ConfigurationLogicDozModServerToStatelessClientTest.java | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/test/java/org/openslx/virtualization/configuration') diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java index 6e14c64..4b07adc 100644 --- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.stream.Stream; import org.apache.commons.io.FileUtils; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ public class VirtualizationConfigurationQemuTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } @Test diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java index 1689007..4eae06b 100644 --- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java @@ -12,8 +12,8 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; @@ -28,7 +28,7 @@ public class VirtualizationConfigurationVirtualBoxTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } @ParameterizedTest diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java index 7493fec..0c164c6 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } @Test diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java index 5a1098a..4e49eab 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ public class ConfigurationLogicDozModServerToDozModClientTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } @Test diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java index f6d56c3..7380277 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ public class ConfigurationLogicDozModServerToStatelessClientTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } @Test -- cgit v1.2.3-55-g7522