Resolve conflicts in CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/2caf3da7 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/2caf3da7 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/2caf3da7 Branch: refs/heads/master Commit: 2caf3da7cfeca675530fa86c6f76c451a433e732 Parents: 2c72c42 c9d508d Author: Chris Mattmann <[email protected]> Authored: Fri Apr 22 15:22:33 2016 -0700 Committer: Chris Mattmann <[email protected]> Committed: Fri Apr 22 15:22:33 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 9 + .../main/appended-resources/META-INF/LICENSE | 227 ----------- tika-bundle/pom.xml | 2 +- .../main/appended-resources/META-INF/LICENSE | 226 ----------- .../org/apache/tika/parser/NetworkParser.java | 4 +- .../org/apache/tika/parser/ParseContext.java | 87 ++-- tika-parsers/pom.xml | 8 +- .../org/apache/tika/parser/epub/EpubParser.java | 8 +- .../tika/parser/microsoft/WordExtractor.java | 11 +- .../ooxml/XSSFExcelExtractorDecorator.java | 1 + .../parser/mp4/DirectFileReadDataSource.java | 7 +- .../tika/parser/pot/PooledTimeSeriesParser.java | 394 ++++++++++--------- .../apache/tika/parser/mp4/MP4ParserTest.java | 12 +- .../test-documents/testMP4_truncated.m4a | Bin 0 -> 74 bytes tika-server/pom.xml | 38 +- 15 files changed, 316 insertions(+), 718 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/2caf3da7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d9563e5,67014f4..bcdc0f0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,13 +1,20 @@@ Release 1.13 - ??? + * Refactored Language Detector into tika-landetect module, + added default N-Gram implementation, Optimiaze Lang + Detector and MIT Text.jl implementation + (TIKA-1872, TIKA-1696, TIKA-1723). + + * Improvements to MIME database for detection of Scientific ++ + * Extract metadata from MP4 videos whether or not the + PooledTimeSeries parser is available via Aditya Dhulipala + (TIKA-1844). + + * Fix NPE when trying to get embedded image identifier in + WordParser (TIKA-1956). + + * Improvements to MIME database for detection of Scientific and other formats present in the TREC-DD-Polar dataset (TIKA-1881, GitHub-85, TIKA-1883, TIKA-1884, TIKA-1886, TIKA-1882). http://git-wip-us.apache.org/repos/asf/tika/blob/2caf3da7/tika-server/pom.xml ----------------------------------------------------------------------
