This is an automated email from the ASF dual-hosted git repository.

lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git

commit 25d0cf73436146d44122f992eca6fa04e444de39
Merge: 724a240 767764e
Author: Lewis John McGibbney <[email protected]>
AuthorDate: Wed Apr 5 19:26:39 2017 -0700

    Merge pull request #139 from bmzhao/NUTCH-2296-elasticsearch-rest-indexing
    
    Fix for NUTCH-2296: Elasticsearch Indexing Over Rest thank you @bmzhao

 build.xml                                          |   3 +
 conf/log4j.properties                              |   4 +
 conf/nutch-default.xml                             |  72 +++++
 ivy/ivy.xml                                        |   7 +
 src/plugin/build.xml                               |   2 +
 src/plugin/indexer-elastic-rest/build-ivy.xml      |  54 ++++
 src/plugin/indexer-elastic-rest/build.xml          |  22 ++
 .../indexer-elastic-rest/howto_upgrade_es.txt      |  23 ++
 src/plugin/indexer-elastic-rest/ivy.xml            |  43 +++
 src/plugin/indexer-elastic-rest/plugin.xml         |  52 ++++
 .../elasticrest/ElasticRestConstants.java          |  33 +++
 .../elasticrest/ElasticRestIndexWriter.java        | 329 +++++++++++++++++++++
 .../indexwriter/elasticrest/package-info.java      |  22 ++
 13 files changed, 666 insertions(+)

diff --cc ivy/ivy.xml
index 853a639,8e048fa..cc7f8d3
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@@ -127,10 -127,14 +127,17 @@@
        <dependency org="org.apache.wicket" name="wicket-spring" rev="6.16.0" 
conf="*->default" />
        <dependency org="de.agilecoders.wicket" name="wicket-bootstrap-core" 
rev="0.9.2" conf="*->default" />
        <dependency org="de.agilecoders.wicket" 
name="wicket-bootstrap-extensions" rev="0.9.2" conf="*->default" />
 +              
 +              <!-- RabbitMQ dependencies -->
 +              <dependency org="com.rabbitmq" name="amqp-client" rev="3.6.5" 
conf="*->default" />
  
+ 
+               <!--Added Because of Elasticsearch JEST client-->
+               <!--TODO refactor these to indexer-elastic-rest plugin somehow, 
currently doesn't resolve correctly-->
+               <dependency org="org.apache.httpcomponents" name="httpcore-nio" 
rev="4.4.4"/>
+               <dependency org="org.apache.httpcomponents" name="httpcore" 
rev="4.4.4"/>
+               <dependency org="org.apache.httpcomponents" name="httpclient" 
rev="4.5.2"/>
+ 
                <!--global exclusion -->
                <exclude module="jmxtools" />
                <exclude module="jms" />

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to