You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2014/12/12 01:21:01 UTC
svn commit: r1644798 - in /nutch/branches/2.x: CHANGES.txt
src/plugin/indexer-elastic/build-ivy.xml
src/plugin/indexer-elastic/howto_upgrade_es.txt
src/plugin/indexer-elastic/ivy.xml src/plugin/indexer-elastic/plugin.xml
Author: lewismc
Date: Fri Dec 12 00:21:01 2014
New Revision: 1644798
URL: http://svn.apache.org/r1644798
Log:
NUTCH-1823 Upgrade to elasticsearch 1.4.1
Added:
nutch/branches/2.x/src/plugin/indexer-elastic/build-ivy.xml
nutch/branches/2.x/src/plugin/indexer-elastic/howto_upgrade_es.txt
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/src/plugin/indexer-elastic/ivy.xml
nutch/branches/2.x/src/plugin/indexer-elastic/plugin.xml
Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1644798&r1=1644797&r2=1644798&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Fri Dec 12 00:21:01 2014
@@ -2,6 +2,8 @@ Nutch Change Log
Current Development 2.3-SNAPSHOT
+* NUTCH-1823 Upgrade to elasticsearch 1.4.1 (Phu Kieu, markus, lewismc)
+
* NUTCH-1829 Generator : unable to distinguish real errors (Mathieu Bouchard, jnioche, snagel)
* NUTCH-1778 Generator not logging number of URLs in batch correctly (jnioche via snagel)
Added: nutch/branches/2.x/src/plugin/indexer-elastic/build-ivy.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/indexer-elastic/build-ivy.xml?rev=1644798&view=auto
==============================================================================
--- nutch/branches/2.x/src/plugin/indexer-elastic/build-ivy.xml (added)
+++ nutch/branches/2.x/src/plugin/indexer-elastic/build-ivy.xml Fri Dec 12 00:21:01 2014
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project name="indexer-elastic" default="deps-jar" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <property name="ivy.install.version" value="2.1.0" />
+ <condition property="ivy.home" value="${env.IVY_HOME}">
+ <isset property="env.IVY_HOME" />
+ </condition>
+ <property name="ivy.home" value="${user.home}/.ant" />
+ <property name="ivy.checksums" value="" />
+ <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+ <target name="download-ivy" unless="offline">
+
+ <mkdir dir="${ivy.jar.dir}"/>
+ <!-- download Ivy from web site so that it can be used even without any special installation -->
+ <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <target name="init-ivy" depends="download-ivy">
+ <!-- try to load ivy here from ivy home, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as local lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the local lib dir. -->
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+ <target name="deps-jar" depends="init-ivy">
+ <ivy:retrieve pattern="lib/[artifact]-[revision].[ext]"/>
+ </target>
+
+</project>
Added: nutch/branches/2.x/src/plugin/indexer-elastic/howto_upgrade_es.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/indexer-elastic/howto_upgrade_es.txt?rev=1644798&view=auto
==============================================================================
--- nutch/branches/2.x/src/plugin/indexer-elastic/howto_upgrade_es.txt (added)
+++ nutch/branches/2.x/src/plugin/indexer-elastic/howto_upgrade_es.txt Fri Dec 12 00:21:01 2014
@@ -0,0 +1,6 @@
+1. Upgrade elasticsearch dependency in src/plugin/indexer-elastic/ivy.xml
+
+2. Upgrade the Elasticsearch specific dependencies in src/plugin/indexer-elastic/plugin.xml
+ To get the list of dependencies and their versions execute:
+ $ ant -f ./build-ivy.xml
+ $ ls lib/
Modified: nutch/branches/2.x/src/plugin/indexer-elastic/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/indexer-elastic/ivy.xml?rev=1644798&r1=1644797&r2=1644798&view=diff
==============================================================================
--- nutch/branches/2.x/src/plugin/indexer-elastic/ivy.xml (original)
+++ nutch/branches/2.x/src/plugin/indexer-elastic/ivy.xml Fri Dec 12 00:21:01 2014
@@ -29,7 +29,7 @@ language governing permissions and limit
<dependencies>
<dependency org="org.elasticsearch" name="elasticsearch"
- rev="1.1.0" conf="*->default" />
+ rev="1.4.1" conf="*->default" />
</dependencies>
</ivy-module>
Modified: nutch/branches/2.x/src/plugin/indexer-elastic/plugin.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/indexer-elastic/plugin.xml?rev=1644798&r1=1644797&r2=1644798&view=diff
==============================================================================
--- nutch/branches/2.x/src/plugin/indexer-elastic/plugin.xml (original)
+++ nutch/branches/2.x/src/plugin/indexer-elastic/plugin.xml Fri Dec 12 00:21:01 2014
@@ -23,21 +23,24 @@
<export name="*" />
</library>
- <library name="elasticsearch-1.1.0.jar"/>
- <library name="lucene-analyzers-common-4.7.0.jar"/>
- <library name="lucene-codecs-4.7.0.jar"/>
- <library name="lucene-core-4.7.0.jar"/>
- <library name="lucene-grouping-4.7.0.jar"/>
- <library name="lucene-highlighter-4.7.0.jar"/>
- <library name="lucene-join-4.7.0.jar"/>
- <library name="lucene-memory-4.7.0.jar"/>
- <library name="lucene-misc-4.7.0.jar"/>
- <library name="lucene-queries-4.7.0.jar"/>
- <library name="lucene-queryparser-4.7.0.jar"/>
- <library name="lucene-sandbox-4.7.0.jar"/>
- <library name="lucene-spatial-4.7.0.jar"/>
- <library name="lucene-suggest-4.7.0.jar"/>
+ <library name="elasticsearch-1.4.1.jar"/>
+ <library name="lucene-analyzers-common-4.10.2.jar"/>
+ <library name="lucene-codecs-4.10.2.jar"/>
+ <library name="lucene-core-4.10.2.jar"/>
+ <library name="lucene-grouping-4.10.2.jar"/>
+ <library name="lucene-highlighter-4.10.2.jar"/>
+ <library name="lucene-join-4.10.2.jar"/>
+ <library name="lucene-memory-4.10.2.jar"/>
+ <library name="lucene-misc-4.10.2.jar"/>
+ <library name="lucene-queries-4.10.2.jar"/>
+ <library name="lucene-queryparser-4.10.2.jar"/>
+ <library name="lucene-sandbox-4.10.2.jar"/>
+ <library name="lucene-spatial-4.10.2.jar"/>
+ <library name="lucene-suggest-4.10.2.jar"/>
<library name="spatial4j-0.4.1.jar"/>
+ <library name="antlr-runtime-3.5.jar"/>
+ <library name="asm-4.1"/>
+ <library name="asm-commons-4.1.jar"/>
</runtime>
<requires>