Merge remote-tracking branch 'origin/master' into TIKA-1508
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/ecdc4035 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/ecdc4035 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/ecdc4035 Branch: refs/heads/master Commit: ecdc403578d2a2b8fb70f66b7df1ece96b5efa9c Parents: 853750d 06633cc Author: tballison <[email protected]> Authored: Mon Jun 13 09:25:24 2016 -0400 Committer: tballison <[email protected]> Committed: Mon Jun 13 09:25:24 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 5 + tika-parsers/pom.xml | 2 +- .../tika/parser/image/xmp/JempboxExtractor.java | 30 ++++ .../parser/image/xmp/JempboxExtractorTest.java | 29 ++- .../test/resources/test-documents/testXMP.xmp | 178 +++++++++++++++++++ 5 files changed, 242 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
