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/03/29 11:14:49 UTC

[tika] branch branch_1x updated: update CHANGES.txt because of conflict in cherry-pick

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


The following commit(s) were added to refs/heads/branch_1x by this push:
     new f9910e2  update CHANGES.txt because of conflict in cherry-pick
f9910e2 is described below

commit f9910e276089c9f9f2d7643aea011efa48e52fbb
Author: tballison <ta...@mitre.org>
AuthorDate: Thu Mar 29 07:14:40 2018 -0400

    update CHANGES.txt because of conflict in cherry-pick
---
 CHANGES.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a97bf6..afe5a4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 Release 1.18 - ???
-   
+
+   * Upgrade PDFBox to 2.0.9 and include new jbig2-imageio
+     from org.apache.pdfbox (TIKA-2579 and TIKA-2607).
+
    * Support for TIFF images in PDF files (TIKA-2338)
    
    * Detection of full encrypted 7z files (TIKA-2568)

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.