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 34687cdb05bc4a6553627c6221786482d67014a2 Author: Konstantin Gribov <[email protected]> AuthorDate: Sat Nov 19 22:29:58 2022 +0300 Migrate tika-parsers-standard-modules to tika-logging --- .../tika-parsers-standard-modules/pom.xml | 25 ++++++---------------- .../tika/parser/microsoft/WordParserTest.java | 14 +++--------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml index 43be87b5c..049f0dac5 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml @@ -41,28 +41,15 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> + <groupId>org.apache.tika</groupId> + <artifactId>tika-logging-slf4j-bridges</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j2-impl</artifactId> + <groupId>org.apache.tika</groupId> + <artifactId>tika-logging-log4j2-impl</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java index 51d574e82..1365cefdb 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java @@ -26,16 +26,14 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.LoggerConfig; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.xml.sax.ContentHandler; import org.apache.tika.TikaTest; import org.apache.tika.config.TikaConfig; +import org.apache.tika.logging.api.LoggerLevelChangeContext; +import org.apache.tika.logging.api.LoggingConfigurator; import org.apache.tika.metadata.DublinCore; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Office; @@ -361,17 +359,11 @@ public class WordParserTest extends TikaTest { @Test public void testExceptions1() throws Exception { XMLResult xml; - LoggerContext ctx = (LoggerContext) LogManager.getContext(); - LoggerConfig lc = ctx.getConfiguration().getRootLogger(); - Level originalLevel = lc.getLevel(); - lc.setLevel(Level.ERROR); - try { + try (LoggerLevelChangeContext ignored = LoggingConfigurator.withRootLoggerLevel("ERROR")) { xml = getXML("testException1.doc"); assertContains("total population", xml.xml); xml = getXML("testException2.doc"); assertContains("electric charge", xml.xml); - } finally { - lc.setLevel(originalLevel); } }
