You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by gr...@apache.org on 2022/11/20 03:13:40 UTC
[tika] 03/04: Migrate tika-app to tika-logging
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch logging-refactoring
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 12ca313d0e59b042f1cc4b85225b77a7c8c816e5
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sat Nov 19 22:25:20 2022 +0300
Migrate tika-app to tika-logging
---
tika-app/pom.xml | 17 +++++------------
tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java | 4 ++--
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index e9d624236..2cb85d382 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -74,20 +74,13 @@
<!-- logging -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-logging-common</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-logging-log4j2-impl</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
index ee7feacfc..ec331fe39 100644
--- a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
+++ b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
@@ -58,7 +58,6 @@ import javax.xml.transform.stream.StreamResult;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.CloseShieldInputStream;
-import org.apache.logging.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
@@ -80,6 +79,7 @@ import org.apache.tika.fork.ForkParser;
import org.apache.tika.gui.TikaGUI;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.language.detect.LanguageHandler;
+import org.apache.tika.logging.api.LoggingConfigurator;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.serialization.JsonMetadata;
@@ -361,7 +361,7 @@ public class TikaCLI {
pipeMode = false;
version();
} else if (arg.equals("-v") || arg.equals("--verbose")) {
- org.apache.logging.log4j.core.config.Configurator.setRootLevel(Level.DEBUG);
+ LoggingConfigurator.setRootLoggerLevel("DEBUG");
} else if (arg.equals("-g") || arg.equals("--gui")) {
pipeMode = false;
if (configFilePath != null) {