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 2018/01/23 19:30:54 UTC
[tika] 02/03: Merge remote-tracking branch 'origin/master'
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit ac2c024cee1e8475c056196aae0526120f99a85b
Merge: 6bd187a e67f220
Author: tballison <ta...@mitre.org>
AuthorDate: Tue Jan 23 11:17:45 2018 -0500
Merge remote-tracking branch 'origin/master'
# Conflicts:
# CHANGES.txt
CHANGES.txt | 5 ++
README.md | 6 +-
.../org/apache/tika/fork/ClassLoaderProxy.java | 19 +++++-
.../org/apache/tika/mime/tika-mimetypes.xml | 67 ++++++++++++++++++++-
.../java/org/apache/tika/fork/ForkParserTest.java | 17 ++++++
.../java/org/apache/tika/fork/ForkTestParser.java | 10 +++
.../fork/unusedpackage/ClassInUnusedPackage.java | 4 ++
.../apache/tika/parser/ocr/TesseractOCRParser.java | 10 ++-
.../java/org/apache/tika/mime/TestMimeTypes.java | 11 ++++
.../org/apache/tika/parser/pkg/RarParserTest.java | 33 ++++++++++
.../test-documents/test-documents-enc.rar | Bin 0 -> 68636 bytes
.../src/test/resources/test-documents/testAC3.ac3 | Bin 0 -> 768 bytes
.../src/test/resources/test-documents/testEAC3.ac3 | Bin 0 -> 768 bytes
13 files changed, 175 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 07f21ac,ef3f102..96b041c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -2,8 -2,11 +2,13 @@@ Release 2.0.0 - ??
* Add a parser for XPS (TIKA-2524).
+ * Mime magic for Dolby Digital AC3 and EAC3 files
+
+ * Fixed bug where TesseractOCRParser ignores configured ImageMagickPath,
+ and set rotation script to ignore Python warnings (TIKA-2509)
+
+ * Upgrade geo-apis to 3.0.1 (TIKA-2535)
+
Release 1.17 - 12/8/2017
***NOTE: THIS IS THE LAST VERSION OF TIKA THAT WILL RUN
--
To stop receiving notification emails like this one, please contact
tallison@apache.org.