This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-2552 in repository https://gitbox.apache.org/repos/asf/tika.git
commit 9523f501060fe25862509b4d3a0387c1d7f4ac56 Merge: da89caf ed0d3d1 Author: TALLISON <[email protected]> AuthorDate: Thu Aug 16 11:33:38 2018 -0400 Merge branch 'branch_1x' into TIKA-2552 tika-dl/pom.xml | 223 ++++++++++++++++----- .../tika/dl/imagerec/DL4JInceptionV3Net.java | 121 ++++++----- .../org/apache/tika/dl/imagerec/DL4JVGG16Net.java | 52 ++--- .../imagerec/imagenet_incpetionv3_class_index.json | 1 - .../apache/tika/dl/imagerec/inceptionv3-model.json | 1 - .../tika/dl/imagerec/DL4JInceptionV3NetTest.java | 5 +- .../apache/tika/dl/imagerec/DL4JVGG16NetTest.java | 8 +- .../tika/dl/imagerec/dl4j-inception3-config.xml | 3 +- tika-eval/pom.xml | 3 +- .../eval/tokens/AlphaIdeographFilterFactory.java | 2 +- .../tika/eval/tokens/AnalyzerDeserializer.java | 179 ++--------------- .../tokens/CJKBigramAwareLengthFilterFactory.java | 2 +- tika-eval/src/main/resources/lucene-analyzers.json | 22 +- tika-example/pom.xml | 2 +- .../tika/example/LazyTextExtractorField.java | 210 ------------------- .../org/apache/tika/example/LuceneIndexer.java | 7 +- .../apache/tika/example/LuceneIndexerExtended.java | 21 +- .../tika/example/MetadataAwareLuceneIndexer.java | 7 +- .../java/org/apache/tika/example/RecentFiles.java | 20 +- tika-nlp/pom.xml | 16 +- tika-parent/pom.xml | 2 +- tika-parsers/pom.xml | 2 +- 22 files changed, 343 insertions(+), 566 deletions(-)
