Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nutch
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/6b141fb1 Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/6b141fb1 Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/6b141fb1 Branch: refs/heads/master Commit: 6b141fb10dcf7fd284d8e685fc0c7ffa35df6800 Parents: 2b4991a 34050ad Author: Thamme Gowda <[email protected]> Authored: Fri Jul 1 10:51:41 2016 -0700 Committer: Thamme Gowda <[email protected]> Committed: Fri Jul 1 10:51:41 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 - build.xml | 8 +- conf/nutch-default.xml | 2 +- default.properties | 7 +- ivy/ivy.xml | 17 ++-- .../org/apache/nutch/fetcher/FetchItem.java | 2 +- src/java/org/apache/nutch/fetcher/Fetcher.java | 82 +++++++++----------- .../nutch/fetcher/FetcherOutputFormat.java | 4 +- .../org/apache/nutch/metadata/Metadata.java | 25 ++++++ src/plugin/indexer-elastic/ivy.xml | 2 +- src/plugin/indexer-elastic/plugin.xml | 52 ++++++++----- .../indexwriter/elastic/ElasticIndexWriter.java | 19 +++-- src/plugin/indexer-solr/ivy.xml | 2 +- src/plugin/indexer-solr/plugin.xml | 2 +- .../org/apache/nutch/parse/html/HtmlParser.java | 4 + .../apache/nutch/parse/html/TestHtmlParser.java | 11 ++- src/plugin/parsefilter-naivebayes/ivy.xml | 4 +- src/plugin/parsefilter-naivebayes/plugin.xml | 4 +- src/plugin/scoring-similarity/build.xml | 10 +-- src/plugin/scoring-similarity/ivy.xml | 1 + src/plugin/scoring-similarity/plugin.xml | 3 +- .../similarity/util/LuceneAnalyzerUtil.java | 4 +- .../similarity/util/LuceneTokenizer.java | 21 +++-- 23 files changed, 167 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
