Author: kwright
Date: Tue Mar 4 21:38:54 2014
New Revision: 1574218
URL: http://svn.apache.org/r1574218
Log:
Fix for CONNECTORS-908.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1574218&r1=1574217&r2=1574218&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Mar 4 21:38:54 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-908: Update Solr 3.x, Solr 4.x, and ElasticSearch
+plugin versions bundled with ManifoldCF.
+(Karl Wright)
+
CONNECTORS-906: Include documentation section on advanced
properties.xml settings.
(Graeme Seaton)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1574218&r1=1574217&r2=1574218&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Mar 4 21:38:54 2014
@@ -4107,10 +4107,10 @@ Use Apache Forrest version forrest-0.9-d
<mkdir dir="lib/elasticsearch"/>
<!-- Download and unpack binary artifact -->
<mkdir dir="build/download"/>
- <get
src="http://archive.apache.org/dist/manifoldcf/apache-manifoldcf-elasticsearch-plugin-1.1-bin.zip"
dest="build/download/apache-manifoldcf-elasticsearch-plugin-bin.zip"/>
+ <get
src="http://www.apache.org/dist/manifoldcf/apache-manifoldcf-elasticsearch-plugin-2.0-bin.zip"
dest="build/download/apache-manifoldcf-elasticsearch-plugin-bin.zip"/>
<unzip
src="build/download/apache-manifoldcf-elasticsearch-plugin-bin.zip"
dest="build/download/apache-manifoldcf-elasticsearch-plugin-bin"/>
<copy todir="lib/elasticsearch">
- <fileset
dir="build/download/apache-manifoldcf-elasticsearch-plugin-bin/elasticsearch-plugin-mcf-1.1"/>
+ <fileset
dir="build/download/apache-manifoldcf-elasticsearch-plugin-bin/elasticsearch-plugin-mcf-2.0"/>
</copy>
</target>
@@ -4219,16 +4219,16 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-solr-plugins">
<mkdir dir="lib/solr-3.x"/>
<mkdir dir="build/download"/>
- <get
src="http://archive.apache.org/dist/manifoldcf/apache-manifoldcf-solr-3.x-plugin-1.1-bin.zip"
dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip"/>
+ <get
src="http://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-3.x-plugin-2.0-bin.zip"
dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip"/>
<unzip src="build/download/apache-manifoldcf-solr-3.x-plugin-bin.zip"
dest="build/download/apache-manifoldcf-solr-3.x-plugin-bin"/>
<copy todir="lib/solr-3.x">
- <fileset
dir="build/download/apache-manifoldcf-solr-3.x-plugin-bin/apache-manifoldcf-solr-3.x-plugin-1.1"/>
+ <fileset
dir="build/download/apache-manifoldcf-solr-3.x-plugin-bin/apache-manifoldcf-solr-3.x-plugin-2.0"/>
</copy>
<mkdir dir="lib/solr-4.x"/>
- <get
src="http://archive.apache.org/dist/manifoldcf/apache-manifoldcf-solr-4.x-plugin-1.1.1-bin.zip"
dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip"/>
+ <get
src="http://www.apache.org/dist/manifoldcf/apache-manifoldcf-solr-4.x-plugin-2.0-bin.zip"
dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip"/>
<unzip src="build/download/apache-manifoldcf-solr-4.x-plugin-bin.zip"
dest="build/download/apache-manifoldcf-solr-4.x-plugin-bin"/>
<copy todir="lib/solr-4.x">
- <fileset
dir="build/download/apache-manifoldcf-solr-4.x-plugin-bin/apache-manifoldcf-solr-4.x-plugin-1.1.1"/>
+ <fileset
dir="build/download/apache-manifoldcf-solr-4.x-plugin-bin/apache-manifoldcf-solr-4.x-plugin-2.0"/>
</copy>
</target>