From b46f5fd82affe66c8439fdc6721cff2a79ad652b Mon Sep 17 00:00:00 2001 From: Christian Mahnke Date: Mon, 8 Jan 2024 10:51:17 +0100 Subject: [PATCH] Replaced log4j usage with commons-io, see https://github.com/onthegomap/planetiler/discussions/773#discussioncomment-8037396 --- planetiler-core/pom.xml | 5 +++++ .../onthegomap/planetiler/stream/WriteableStreamArchive.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/planetiler-core/pom.xml b/planetiler-core/pom.xml index fe4e01bbd6..6d375c696a 100644 --- a/planetiler-core/pom.xml +++ b/planetiler-core/pom.xml @@ -154,6 +154,11 @@ geopackage ${geopackage.version} + + commons-io + commons-io + 2.11.0 + diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableStreamArchive.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableStreamArchive.java index d902f3e0c0..4d7cc228db 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableStreamArchive.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableStreamArchive.java @@ -12,7 +12,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.logging.log4j.core.util.CloseShieldOutputStream; +import org.apache.commons.io.output.CloseShieldOutputStream; /** * Base archive for all kinds of simple file streams. This is primarily useful when the file is a named pipe. In that @@ -95,7 +95,7 @@ protected final OutputStream getPrimaryOutputStream() { * the outputstream of the first writer must be closed by the archive and not the tile writer * since the primary stream can be used to send meta data, as well */ - return new CloseShieldOutputStream(primaryOutputStream); + return CloseShieldOutputStream.wrap(primaryOutputStream); } @FunctionalInterface