Author: lehmi
Date: Fri Oct 27 15:10:19 2023
New Revision: 1913391
URL: http://svn.apache.org/viewvc?rev=1913391&view=rev
Log:
PDFBOX-5695: switch to log4j as suggested by Axel Howind
Modified:
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/Rendering.java
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/TextExtraction.java
pdfbox/trunk/io/pom.xml
pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java
pdfbox/trunk/parent/pom.xml
pdfbox/trunk/pdfbox/pom.xml
Modified:
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/Rendering.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/Rendering.java?rev=1913391&r1=1913390&r2=1913391&view=diff
==============================================================================
---
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/Rendering.java
(original)
+++
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/Rendering.java
Fri Oct 27 15:10:19 2023
@@ -45,8 +45,7 @@ public class Rendering {
static final String RENDER_OUTPUT_DIR = "target/renditions";
static {
- System.setProperty("org.apache.commons.logging.Log",
- "org.apache.commons.logging.impl.NoOpLog");
+ Configurator.setAllLevels(LogManager.getRootLogger().getName(),
Level.OFF);
java.util.logging.Logger.getLogger("org.apache").setLevel(java.util.logging.Level.OFF);
Path path = Paths.get(RENDER_OUTPUT_DIR);
try {
Modified:
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/TextExtraction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/TextExtraction.java?rev=1913391&r1=1913390&r2=1913391&view=diff
==============================================================================
---
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/TextExtraction.java
(original)
+++
pdfbox/trunk/benchmark/src/main/java/org/apache/pdfbox/benchmark/TextExtraction.java
Fri Oct 27 15:10:19 2023
@@ -34,8 +34,7 @@ public class TextExtraction {
static final String PDF32000_2008 = "target/pdfs/PDF32000_2008.pdf";
static {
- System.setProperty("org.apache.commons.logging.Log",
- "org.apache.commons.logging.impl.NoOpLog");
+ Configurator.setAllLevels(LogManager.getRootLogger().getName(),
Level.OFF);
java.util.logging.Logger.getLogger("org.apache").setLevel(java.util.logging.Level.OFF);
}
Modified: pdfbox/trunk/io/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/io/pom.xml?rev=1913391&r1=1913390&r2=1913391&view=diff
==============================================================================
--- pdfbox/trunk/io/pom.xml (original)
+++ pdfbox/trunk/io/pom.xml Fri Oct 27 15:10:19 2023
@@ -39,11 +39,6 @@
<dependencies>
<dependency>
- <!-- TODO remove when transition to Log4J is complete -->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
Modified: pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java?rev=1913391&r1=1913390&r2=1913391&view=diff
==============================================================================
--- pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java (original)
+++ pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/IOUtils.java Fri Oct 27
15:10:19 2023
@@ -43,7 +43,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.function.Consumer;
-import org.apache.commons.logging.Log;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.io.RandomAccessStreamCache.StreamCacheCreateFunction;
@@ -139,37 +138,6 @@ public final class IOUtils
}
/**
- * Try to close an IO resource and log and return if there was an
exception.
- *
- * <p>An exception is only returned if the IOException passed in is null.
- *
- * @param closeable to be closed
- * @param logger the logger to be used so that logging appears under that
log instance
- * @param resourceName the name to appear in the log output
- * @param initialException if set, this exception will be returned even
where there is another
- * exception while closing the IO resource
- * @return the IOException is there was any but only if initialException
is null
- * @deprecated use {@link Logger} instead
- */
- @Deprecated
- public static IOException closeAndLogException(Closeable closeable, Log
logger, String resourceName, IOException initialException)
- {
- try
- {
- closeable.close();
- }
- catch (IOException ioe)
- {
- logger.warn("Error closing " + resourceName, ioe);
- if (initialException == null)
- {
- return ioe;
- }
- }
- return initialException;
- }
-
- /**
* Try to close an IO resource and log and return if there was an
exception.
*
* <p>An exception is only returned if the IOException passed in is null.
Modified: pdfbox/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/parent/pom.xml?rev=1913391&r1=1913390&r2=1913391&view=diff
==============================================================================
--- pdfbox/trunk/parent/pom.xml (original)
+++ pdfbox/trunk/parent/pom.xml Fri Oct 27 15:10:19 2023
@@ -85,11 +85,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
Modified: pdfbox/trunk/pdfbox/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=1913391&r1=1913390&r2=1913391&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Fri Oct 27 15:10:19 2023
@@ -52,10 +52,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<scope>compile</scope>
@@ -112,12 +108,6 @@
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>${log4j2.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
