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/09/01 15:23:46 UTC
[tika] 01/03: Merge remote-tracking branch 'origin/main' into
TIKA-3179
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3179
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 3a532a2b40f0bac61102ef5a86acfc50b92d9c4a
Merge: ff7d43a 04d520c
Author: tallison <ta...@apache.org>
AuthorDate: Tue Sep 1 11:00:15 2020 -0400
Merge remote-tracking branch 'origin/main' into TIKA-3179
# Conflicts:
# tika-parser-modules/pom.xml
# tika-parser-modules/tika-parser-db-module/pom.xml
tika-eval/pom.xml | 4 +-
tika-example/pom.xml | 8 +-
tika-langdetect/pom.xml | 2 +-
tika-parent/pom.xml | 131 ++++++++++++++-------
tika-parsers-advanced/tika-dl/pom.xml | 8 +-
.../tika-parser-advancedmedia-module/pom.xml | 4 +-
.../tika-parser-nlp-module/pom.xml | 6 +-
.../tika-parser-scientific-module/pom.xml | 4 +-
tika-parsers/tika-parser-apple-module/pom.xml | 2 +-
tika-parsers/tika-parser-audiovideo-module/pom.xml | 4 -
tika-parsers/tika-parser-code-module/pom.xml | 2 +-
tika-parsers/tika-parser-html-module/pom.xml | 2 +-
tika-parsers/tika-parser-image-module/pom.xml | 6 -
tika-parsers/tika-parser-microsoft-module/pom.xml | 2 +-
tika-parsers/tika-parser-news-module/pom.xml | 4 +-
tika-parsers/tika-parser-pkg-module/pom.xml | 6 -
tika-parsers/tika-parser-text-module/pom.xml | 2 +-
tika-parsers/tika-parser-xml-module/pom.xml | 2 +-
tika-server/pom.xml | 2 +-
tika-translate/pom.xml | 4 +-
tika-xmp/pom.xml | 2 +-
21 files changed, 118 insertions(+), 89 deletions(-)