This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 95ef6583a TIKA-3842 -- upgrade to slf4j 2.x
95ef6583a is described below
commit 95ef6583a57c1e79fabd7d971b9da7a4275e0621
Author: tallison <[email protected]>
AuthorDate: Mon Sep 19 15:18:34 2022 -0400
TIKA-3842 -- upgrade to slf4j 2.x
---
CHANGES.txt | 4 ++++
tika-app/pom.xml | 2 +-
tika-core/pom.xml | 2 +-
tika-eval/tika-eval-app/pom.xml | 2 +-
tika-fuzzing/pom.xml | 2 +-
tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml | 2 +-
tika-langdetect/tika-langdetect-lingo24/pom.xml | 2 +-
tika-langdetect/tika-langdetect-mitll-text/pom.xml | 2 +-
tika-parent/pom.xml | 7 ++-----
tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 2 +-
tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 2 +-
.../tika-parser-microsoft-module/pom.xml | 2 +-
.../tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml | 2 +-
tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml | 2 +-
tika-pipes/tika-emitters/tika-emitter-s3/pom.xml | 2 +-
tika-pipes/tika-emitters/tika-emitter-solr/pom.xml | 2 +-
tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml | 2 +-
tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml | 2 +-
tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml | 2 +-
tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml | 2 +-
tika-server/tika-server-client/pom.xml | 2 +-
tika-server/tika-server-core/pom.xml | 2 +-
tika-server/tika-server-standard/pom.xml | 2 +-
23 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 86f6829d8..6d7297274 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ Release 2.5.0 - ???
* Avoid infinite loop in bookmark extraction from PDFs (TIKA-3832).
+ * Upgraded to slf4j 2.0.1 (TIKA-3842).
+
* Added upsert option for the OpenSearch emitter (TIKA-3855).
* Extract PDF signature information at the document level
@@ -44,6 +46,8 @@ Release 2.5.0 - ???
* Fix bug causing some Exif dates to be decoded wrongly on
timezones different than UTC (TIKA-3815).
+ * Numerous dependency upgrades (TIKA-3795).
+
Release 2.4.1 - 06/14/2022
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 73e980498..19b67d415 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 001826c37..38007f6b6 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index b16c26ef5..ff7f3e034 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index 5728e1509..4a0298634 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -66,7 +66,7 @@
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
index 2d3030832..b5434c3af 100644
--- a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tika-langdetect/tika-langdetect-lingo24/pom.xml
b/tika-langdetect/tika-langdetect-lingo24/pom.xml
index 8e44f1192..2611136b6 100644
--- a/tika-langdetect/tika-langdetect-lingo24/pom.xml
+++ b/tika-langdetect/tika-langdetect-lingo24/pom.xml
@@ -52,7 +52,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-langdetect/tika-langdetect-mitll-text/pom.xml
b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
index 45aea7c74..6dc9ffb25 100644
--- a/tika-langdetect/tika-langdetect-mitll-text/pom.xml
+++ b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
@@ -51,7 +51,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index a89f420b1..031f89722 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -369,8 +369,6 @@
<osgi.core.version>6.0.0</osgi.core.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<parso.version>2.0.14</parso.version>
- <!-- some conflict with slf4j with >= 4.12.0
- causes failure in testForkParser -->
<pax.exam.version>4.13.1</pax.exam.version>
<pdfbox.version>2.0.26</pdfbox.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
@@ -379,8 +377,7 @@
<rome.version>1.18.0</rome.version>
<scm.version>1.13.0</scm.version>
<sis.version>1.2</sis.version>
- <!-- we'll need to stay on 1.7 until we're java modularized ? -->
- <slf4j.version>1.7.36</slf4j.version>
+ <slf4j.version>2.0.1</slf4j.version>
<solrj.version>8.11.2</solrj.version>
<spring.version>5.3.23</spring.version>
<sqlite.version>3.39.3.0</sqlite.version>
@@ -601,7 +598,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
index 8e2e1828f..b84264f36 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -166,7 +166,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
index 0c3e1ba91..122dca733 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
@@ -110,7 +110,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
index cb65c2813..9947e9944 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml
@@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
index ded438e35..5230bc8bf 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
b/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
index c14305faa..150c1e985 100644
--- a/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
index d60968eca..c0650b98c 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
b/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
index 171d35789..0f08d0825 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
index 9238faea0..7964d741e 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
index 1a5df00a3..f2a9e19a6 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
index d7e8d0329..c0fd760fe 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
index a14dfbc82..dba15fb1b 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tika-server/tika-server-client/pom.xml
b/tika-server/tika-server-client/pom.xml
index f3ab2d64a..f7019b838 100644
--- a/tika-server/tika-server-client/pom.xml
+++ b/tika-server/tika-server-client/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tika-server/tika-server-core/pom.xml
b/tika-server/tika-server-core/pom.xml
index 90f0fad1e..8694dfc95 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
diff --git a/tika-server/tika-server-standard/pom.xml
b/tika-server/tika-server-standard/pom.xml
index d023a1964..7a61a5f9d 100644
--- a/tika-server/tika-server-standard/pom.xml
+++ b/tika-server/tika-server-standard/pom.xml
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<!-- test jars -->
