Browse Source

elasticsearch 6.6.0

Shinsuke Sugaya 6 years ago
parent
commit
b9f9372505
3 changed files with 31 additions and 24 deletions
  1. 23 21
      plugin.xml
  2. 3 3
      pom.xml
  3. 5 0
      src/main/java/org/codelibs/fess/es/client/FessEsClient.java

+ 23 - 21
plugin.xml

@@ -13,66 +13,66 @@
 		<mkdir dir="${plugins.dir}" />
 		<!-- analysis-extension -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="6.5.1" />
-			<param name="plugin.zip.version" value="6.5.1" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190131.003325-1" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="6.5.0" />
-			<param name="plugin.zip.version" value="6.5.0" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190130.222646-1" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="6.5.0" />
-			<param name="plugin.zip.version" value="6.5.0" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190130.235321-1" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="dataformat" />
-			<param name="plugin.version" value="6.5.0" />
-			<param name="plugin.zip.version" value="6.5.0" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190131.004229-1" />
 		</antcall>
 		<!-- langfield -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="langfield" />
-			<param name="plugin.version" value="6.5.0" />
-			<param name="plugin.zip.version" value="6.5.0" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190131.002703-1" />
 		</antcall>
 		<!-- learning-to-rank -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="learning-to-rank" />
-			<param name="plugin.version" value="6.5.0" />
-			<param name="plugin.zip.version" value="6.5.0" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190131.002835-1" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="6.5.0" />
-			<param name="plugin.zip.version" value="6.5.0" />
+			<param name="plugin.version" value="6.6.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.6.0-20190131.003017-1" />
 		</antcall>
 
 		<antcall target="remove.jars" />
@@ -96,6 +96,8 @@
 				<include name="configsync/commons-codec-*" />
 				<include name="dataformat/commons-codec-*" />
 				<include name="dataformat/commons-collections4-*" />
+				<include name="dataformat/commons-compress-*" />
+				<include name="dataformat/commons-math3-*" />
 				<include name="dataformat/curvesapi-*" />
 				<include name="dataformat/orangesignal-csv-*" />
 				<include name="dataformat/poi-*" />

+ 3 - 3
pom.xml

@@ -63,11 +63,11 @@
 		<crawler.version>3.0.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>6.5.3-SNAPSHOT</suggest.version>
+		<suggest.version>6.6.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>6.5.4</elasticsearch.version>
-		<elasticsearch.httpclient.version>6.5.0-SNAPSHOT</elasticsearch.httpclient.version>
+		<elasticsearch.version>6.6.0</elasticsearch.version>
+		<elasticsearch.httpclient.version>6.6.0-SNAPSHOT</elasticsearch.httpclient.version>
 		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
 
 		<!-- Tomcat -->

+ 5 - 0
src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -1515,4 +1515,9 @@ public class FessEsClient implements Client {
     public void fieldCaps(final FieldCapabilitiesRequest request, final ActionListener<FieldCapabilitiesResponse> listener) {
         client.fieldCaps(request, listener);
     }
+
+    @Override
+    public BulkRequestBuilder prepareBulk(String globalIndex, String globalType) {
+        return client.prepareBulk(globalIndex, globalType);
+    }
 }