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 --- .../java/org/openslx/libvirt/capabilities/CapabilitiesTest.java | 6 +++--- src/test/java/org/openslx/libvirt/domain/DomainTest.java | 6 +++--- src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/test/java/org/openslx/libvirt') diff --git a/src/test/java/org/openslx/libvirt/capabilities/CapabilitiesTest.java b/src/test/java/org/openslx/libvirt/capabilities/CapabilitiesTest.java index e7d7651..fd90698 100644 --- a/src/test/java/org/openslx/libvirt/capabilities/CapabilitiesTest.java +++ b/src/test/java/org/openslx/libvirt/capabilities/CapabilitiesTest.java @@ -8,8 +8,8 @@ import static org.junit.jupiter.api.Assertions.fail; import java.math.BigInteger; import java.util.List; -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; @@ -32,7 +32,7 @@ public class CapabilitiesTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } private Capabilities newCapabilitiesInstance( String xmlFileName ) diff --git a/src/test/java/org/openslx/libvirt/domain/DomainTest.java b/src/test/java/org/openslx/libvirt/domain/DomainTest.java index f371e9e..f55c511 100644 --- a/src/test/java/org/openslx/libvirt/domain/DomainTest.java +++ b/src/test/java/org/openslx/libvirt/domain/DomainTest.java @@ -6,8 +6,8 @@ import static org.junit.jupiter.api.Assertions.fail; import java.math.BigInteger; -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; @@ -25,7 +25,7 @@ public class DomainTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } public static Domain getDomain( String xmlFileName ) diff --git a/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java b/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java index 75b934e..02c8b19 100644 --- a/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java +++ b/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java @@ -13,8 +13,8 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; 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; @@ -43,7 +43,7 @@ public class LibvirtXmlDocumentTest public static void setUp() { // disable logging with log4j - LogManager.getRootLogger().setLevel( Level.OFF ); + Configurator.setRootLevel( Level.OFF ); } private LibvirtXmlDocument newLibvirtXmlDocumentInstance( String xmlFileName ) -- cgit v1.2.3-55-g7522