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 2021/04/28 16:04:59 UTC
[tika] 02/05: Merge remote-tracking branch 'origin/branch_1x' into
branch_1x
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 34fb7753bbcf97c757d9bba81e9cdd42afe9d1f6
Merge: cd191ff f51a905
Author: tballison <ta...@apache.org>
AuthorDate: Tue Apr 13 12:05:03 2021 -0400
Merge remote-tracking branch 'origin/branch_1x' into branch_1x
# Conflicts:
# CHANGES.txt
CHANGES.txt | 2 +
tika-nlp/pom.xml | 2 +-
.../java/org/apache/tika/parser/pdf/PDFParser.java | 2 +-
.../apache/tika/server/resource/TikaResource.java | 49 ++++++++++++++-----
.../org/apache/tika/server/TikaResourceTest.java | 55 +++++++++++++++++++---
5 files changed, 88 insertions(+), 22 deletions(-)
diff --cc CHANGES.txt
index a918b4d,4c3464b..9735a8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,9 +1,8 @@@
Release 1.27 - ???
+ * Tika's PDFParser should use the underlying file if one is passed in
+ via a TikaInputStream (TIKA-3350)
-
Release 1.26 - 03/24/2021
* Fix thread safety bug in OpenOffice parser (TIKA-3334).