This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_2x by this push:
new 58b82b3f0 TIKA-4150 - revert shading (#1384)
58b82b3f0 is described below
commit 58b82b3f014458e4e9d50174bcc2a3aa46b106c9
Author: Tim Allison <[email protected]>
AuthorDate: Tue Oct 3 15:11:27 2023 -0400
TIKA-4150 - revert shading (#1384)
* TIKA-4150 - shade commons-io in tika-app --revert
---
CHANGES.txt | 2 --
tika-app/pom.xml | 8 --------
2 files changed, 10 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index a9cb27fbb..9d6a3b3ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,5 @@
Release 2.9.1 - ??
- * Shaded commons-io in tika-app for compatibility with Hadoop (TIKA-4150).
-
* Fix bug in DateUtils that stripped timezone information from
incoming Calendar objects (TIKA-4126).
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 767b359d8..fe7da36d9 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -116,14 +116,6 @@
<goal>shade</goal>
</goals>
<configuration>
- <!-- we have to do this to avoid potential conflicts with, e.g.
hadoop, and others
- who are using old versions of commons-io -->
- <relocations>
- <relocation>
- <pattern>org.apache.commons.io.</pattern>
- <shadedPattern>shaded.org.apache.commons.io.</shadedPattern>
- </relocation>
- </relocations>
<createDependencyReducedPom>
false
</createDependencyReducedPom>
