This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 5b0f17e7d3bb51df63f1169b0f5909b5a7f0fbf5
Merge: 6b32c53 81818e4
Author: tallison <talli...@apache.org>
AuthorDate: Mon Oct 28 15:07:40 2019 -0400
Merge remote-tracking branch 'origin/branch_1x' into branch_1x
CHANGES.txt | 2 +
.../org/apache/tika/mime/tika-mimetypes.xml | 8 ++
tika-example/pom.xml | 4 +-
tika-parent/pom.xml | 12 +--
tika-parsers/pom.xml | 2 +-
.../tika/parser/xliff/XLIFF12ContentHandler.java | 116 +++++++++++++++++++++
.../apache/tika/parser/xliff/XLIFF12Parser.java | 77 ++++++++++++++
.../services/org.apache.tika.parser.Parser | 1 +
.../tika/parser/xliff/XLIFF12ParserTest.java | 48 +++++++++
.../test/resources/test-documents/testXLIFF12.xlf | 35 +++++++
tika-server/pom.xml | 2 +-
11 files changed, 297 insertions(+), 10 deletions(-)
