You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/12/03 22:57:26 UTC
[tika] 01/03: Merge branch 'TIKA-3178' into main
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
commit 074d135e58b3fbaa832056d62c96393bb94fc42e
Merge: 1219866 1bda1ac
Author: tallison <ta...@apache.org>
AuthorDate: Wed Dec 2 13:09:46 2020 -0500
Merge branch 'TIKA-3178' into main
# Conflicts:
# pom.xml
# tika-parsers/pom.xml
pom.xml | 2 +-
tika-bundle/pom.xml | 17 +++++--
.../test/java/org/apache/tika/bundle/BundleIT.java | 3 +-
tika-core/pom.xml | 6 +++
tika-parsers/pom.xml | 18 ++++++++
.../org/apache/tika/parser/internal/Activator.java | 54 ++++++++++++++++++++++
6 files changed, 94 insertions(+), 6 deletions(-)
diff --cc pom.xml
index 82933c0,c2f3a09..30a3821
--- a/pom.xml
+++ b/pom.xml
@@@ -37,8 -37,10 +37,8 @@@
<modules>
<module>tika-parent</module>
<module>tika-core</module>
- <module>tika-parser-modules</module>
<module>tika-parsers</module>
- <!-- <module>tika-bundle</module> turn this off for now -->
+ <module>tika-bundle</module>
- <module>tika-parsers-extended</module>
<module>tika-xmp</module>
<module>tika-serialization</module>
<module>tika-batch</module>