[tika] 03/06: Pull request #332 resolve conflicts. In 1.x, we use JUL in core.

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit fecbbf87e5d468209c545fa32b5d6024382fcca1
Author: tallison <ta...@apache.org>
AuthorDate: Wed Sep 9 09:32:16 2020 -0400

    Pull request #332 resolve conflicts.  In 1.x, we use JUL in core.
---
 .../src/main/java/org/apache/tika/io/TemporaryResources.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tika-core/src/main/java/org/apache/tika/io/TemporaryResources.java b/tika-core/src/main/java/org/apache/tika/io/TemporaryResources.java
index 6a1e1b6..42e5c77 100644
--- a/tika-core/src/main/java/org/apache/tika/io/TemporaryResources.java
+++ b/tika-core/src/main/java/org/apache/tika/io/TemporaryResources.java
@@ -24,8 +24,9 @@ import java.nio.file.Path;
 import java.util.LinkedList;
 
 import org.apache.tika.exception.TikaException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Utility class for tracking and ultimately closing or otherwise disposing
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TemporaryResources implements Closeable {
 
-    private static final Logger LOG = LoggerFactory.getLogger(TemporaryResources.class);
+    private static final Logger LOG = Logger.getLogger(TemporaryResources.class.getName());
 
     /**
      * Tracked resources in LIFO order.
@@ -89,7 +90,7 @@ public class TemporaryResources implements Closeable {
                     Files.delete(path);
                 } catch (IOException e) {
                     // delete when exit if current delete fail
-                    LOG.warn("delete tmp file fail, will delete it on exit");
+                    LOG.log(Level.WARNING, "delete tmp file failed; will delete it on exit");
                     path.toFile().deleteOnExit();
                 }
             }