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/19 21:12:37 UTC
[tika] branch remove-log4j created (now f1b5759f6)
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a change to branch remove-log4j
in repository https://gitbox.apache.org/repos/asf/tika.git
at f1b5759f6 Update changelog: log4j removal
This branch includes the following new commits:
new 5e318e239 Remove log4j 1.2.x exclusion in ossindex plugin
new 82c42a003 Remove log4j 1.2 and reload4j from tika-age-recognizer
new 9eea5835d Remove log4j 1.2.x from tika-parsers-nlp-module
new f1b5759f6 Update changelog: log4j removal
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tika] 04/04: Update changelog: log4j removal
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch remove-log4j
in repository https://gitbox.apache.org/repos/asf/tika.git
commit f1b5759f6adc094376c57195adcb74140b0f8308
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sun Nov 20 00:07:09 2022 +0300
Update changelog: log4j removal
Fixes #TIKA-3935
---
CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a355a3b8..ae888f291 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
Release 2.6.1 - ???
+ * Remove log4j 1.2.x (and slf4j-log4j12 which now redirects to slf4j-reload4j) from
+ all modules (TIKA-3935).
+
* Add SVG detection for svg files lacking the xml header (TIKA-3308).
* Upgrade to Bouncy Castle 1.71 and jdk18on jars (TIKA-3933).
[tika] 01/04: Remove log4j 1.2.x exclusion in ossindex plugin
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch remove-log4j
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 5e318e23914f8ab5f0b0ca237166c5f66890b8a5
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sat Nov 19 22:50:41 2022 +0300
Remove log4j 1.2.x exclusion in ossindex plugin
---
tika-parent/pom.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 11217e097..f7853970e 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -1006,11 +1006,6 @@
<artifactId>lucene-queryparser</artifactId>
<version>4.0.0</version>
</exclude>
- <exclude>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </exclude>
<!-- this one is used in tika-example -->
<exclude>
<!-- sonatype: https://github.com/apache/commons-dbcp/commit/a4c5af0da1de3a7f50c72fc7edaa1f653ca276dd -->
[tika] 03/04: Remove log4j 1.2.x from tika-parsers-nlp-module
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch remove-log4j
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 9eea5835dc66959d1336064a5ce5b67a1d71f0b2
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Sat Nov 19 23:50:54 2022 +0300
Remove log4j 1.2.x from tika-parsers-nlp-module
---
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
index 9301a3e46..b7338c4a7 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
@@ -54,6 +54,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -133,6 +137,13 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
[tika] 02/04: Remove log4j 1.2 and reload4j from tika-age-recognizer
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grossws pushed a commit to branch remove-log4j
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 82c42a003600618875604ce532149f20993bfd35
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Thu Nov 17 17:52:35 2022 +0300
Remove log4j 1.2 and reload4j from tika-age-recognizer
---
tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
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 d3d97dc5f..fe7e162c4 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -92,16 +92,6 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.36</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
<!-- avoid conflicts because of age-predictor-api -->
<dependency>
@@ -157,6 +147,10 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Test dependencies -->