Author: kwright
Date: Sun Apr 19 09:49:06 2020
New Revision: 1876718
URL: http://svn.apache.org/viewvc?rev=1876718&view=rev
Log:
Update to a modern version of ES and mapper attachment to test against
Modified:
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
Modified: manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml?rev=1876718&r1=1876717&r2=1876718&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml Sun
Apr 19 09:49:06 2020
@@ -30,31 +30,44 @@
<import file="${mcf-dist}/connector-build.xml"/>
- <property name="elasticsearch.version" value="1.0.1"/>
+ <property name="elasticsearch.version" value="7.6.2"/>
+ <property name="elasticsearch.mapper-attachments.version" value="3.1.2"/>
+
+ <target name="download-mapper-attachments">
+ <property name="elasticsearch-package" value="org/elasticsearch"/>
+
+ <!-- download and install the attachment plugin -->
+ <mkdir
dir="test-materials/elasticsearch-${elasticsearch.version}/plugins"/>
+
+ <antcall target="download-via-maven">
+ <param name="project-path" value="${elasticsearch-package}"/>
+ <param name="artifact-version"
value="${elasticsearch.mapper-attachments.version}"/>
+ <param name="target"
value="test-materials/elasticsearch-${elasticsearch.version}/plugins"/>
+ <param name="artifact-name"
value="elasticsearch-mapper-attachments"/>
+ <param name="artifact-type" value="zip"/>
+ </antcall>
- <target name="download-dependencies">
+ <!--get
src="https://github.com/elasticsearch/elasticsearch-mapper-attachments/archive/v2.0.0.RC1.zip";
+
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/-->
+ <unzip
src="test-materials/elasticsearch-${elasticsearch.version}/plugins/elasticsearch-mapper-attachments-${elasticsearch.mapper-attachments.version}.zip"
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
+ </target>
+
+ <target name="download-elasticsearch">
<mkdir dir="build/download"/>
- <get
src="http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${elasticsearch.version}.tar.gz";
+ <get
src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-linux-x86_64.tar.gz";
dest="build/download/elasticsearch.tar.gz"/>
<gunzip src="build/download/elasticsearch.tar.gz"/>
<untar src="build/download/elasticsearch.tar" dest="test-materials"/>
-
- <!-- download and install the attachment plugin -->
- <mkdir
dir="test-materials/elasticsearch-${elasticsearch.version}/plugins"/>
-
- <get
src="https://github.com/elasticsearch/elasticsearch-mapper-attachments/archive/v2.0.0.RC1.zip";
-
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/>
-
- <unzip
src="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
-
+ </target>
+
+ <target name="download-dependencies"
depends="download-mapper-attachments,download-elasticsearch">
<chmod dir="test-materials/elasticsearch-${elasticsearch.version}"
perm="ugo+rxw">
<fileset dir="**/*"/>
</chmod>
<chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/plugin"
perm="ugo+rx"/>
<chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch"
perm="ugo+rx"/>
<chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch.in.sh"
perm="ugo+rx"/>
-
</target>
<target name="download-cleanup">
