From 0bcb37e66fb7f6cdc652a712b8a0b9b81d995919 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Sun, 31 Dec 2017 17:15:57 +0900
Subject: [PATCH] fix #1407 elasticsearch 6.1 support
---
plugin.xml | 38 +++++++++----------
pom.xml | 16 ++++----
.../fess/ds/impl/EsDataStoreImpl.java | 14 +++----
.../codelibs/fess/es/client/FessEsClient.java | 2 +-
4 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index 42f4a374d..79bfd1652 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<property name="plugins.dir" value="${basedir}/plugins" />
<property name="target.dir" value="${basedir}/target/plugins" />
<property name="site.dir" value="${basedir}/src/main/webapp/WEB-INF/site" />
- <property name="kopf.branch" value="fess-5.0" />
+ <property name="kopf.branch" value="fess-6.0" />
<!-- Maven Repository -->
<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
@@ -19,8 +19,8 @@
<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.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- analysis-ja -->
<antcall target="install.plugin">
@@ -28,8 +28,8 @@
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-ja" />
- <param name="plugin.version" value="6.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- analysis-synonym -->
<antcall target="install.plugin">
@@ -37,8 +37,8 @@
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-synonym" />
- <param name="plugin.version" value="6.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- configsync -->
<antcall target="install.plugin">
@@ -46,8 +46,8 @@
<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.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- dataformat -->
<antcall target="install.plugin">
@@ -55,8 +55,8 @@
<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.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- langfield -->
<antcall target="install.plugin">
@@ -64,8 +64,8 @@
<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.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- minhash -->
<antcall target="install.plugin">
@@ -73,8 +73,8 @@
<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.0.0" />
- <param name="plugin.zip.version" value="6.0.0" />
+ <param name="plugin.version" value="6.1.0" />
+ <param name="plugin.zip.version" value="6.1.0" />
</antcall>
<!-- kopf -->
<get dest="${target.dir}/kopf.zip">
@@ -130,7 +130,7 @@ mv plugins/analysis-seunjeon/elasticsearch/* plugins/analysis-seunjeon/
# Japanese
# https://github.com/codelibs/elasticsearch-analysis-kuromoji-neologd
-PLUGIN_VERSION=6.0.0-SNAPSHOT
+PLUGIN_VERSION=6.1.0-SNAPSHOT
rm -rf plugins/analysis-kuromoji-neologd
wget -O target/analysis-kuromoji-neologd.zip http://central.maven.org/maven2/org/codelibs/elasticsearch-analysis-kuromoji-neologd/${PLUGIN_VERSION}/elasticsearch-analysis-kuromoji-neologd-${PLUGIN_VERSION}.zip
unzip -d plugins/analysis-kuromoji-neologd target/analysis-kuromoji-neologd.zip
@@ -138,7 +138,7 @@ mv plugins/analysis-kuromoji-neologd/elasticsearch/* plugins/analysis-kuromoji-n
# Vietnamese
# https://github.com/duydo/elasticsearch-analysis-vietnamese
-PLUGIN_VERSION=6.0.0-SNAPSHOT
+PLUGIN_VERSION=6.1.0-SNAPSHOT
rm -rf plugins/analysis-vietnamese
wget -O target/analysis-vietnamese.zip https://github.com/duydo/elasticsearch-analysis-vietnamese/releases/download/v${PLUGIN_VERSION}/elasticsearch-analysis-vietnamese-${PLUGIN_VERSION}.zip
unzip -d plugins/analysis-vietnamese target/analysis-vietnamese.zip
@@ -149,7 +149,7 @@ rm plugins/analysis-vietnamese/opennlp-maxent-*.jar
rm plugins/analysis-vietnamese/jwnl-*.jar
# Simplified Chinese
-PLUGIN_VERSION=6.0.0-SNAPSHOT
+PLUGIN_VERSION=6.1.0-SNAPSHOT
rm -rf plugins/analysis-smartcn
wget -O target/analysis-smartcn.zip https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-smartcn/analysis-smartcn-${PLUGIN_VERSION}.zip
unzip -d plugins/analysis-smartcn target/analysis-smartcn.zip
@@ -157,7 +157,7 @@ mv plugins/analysis-smartcn/elasticsearch/* plugins/analysis-smartcn/
# Traditional Chinese
# https://github.com/medcl/elasticsearch-analysis-stconvert
-PLUGIN_VERSION=6.0.0-SNAPSHOT
+PLUGIN_VERSION=6.1.0-SNAPSHOT
rm -rf plugins/analysis-stconvert
wget -O target/analysis-stconvert.zip https://github.com/medcl/elasticsearch-analysis-stconvert/releases/download/v${PLUGIN_VERSION}/elasticsearch-analysis-stconvert-${PLUGIN_VERSION}.zip
unzip -d plugins/analysis-stconvert target/analysis-stconvert.zip
diff --git a/pom.xml b/pom.xml
index 53feec1b9..1dc0305d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,16 @@
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Main Framework -->
- <dbflute.version>1.1.5</dbflute.version>
- <lastaflute.version>1.0.3</lastaflute.version>
+ <dbflute.version>1.1.6-RC6</dbflute.version>
+ <lastaflute.version>1.0.4</lastaflute.version>
<lasta.taglib.version>0.7.2</lasta.taglib.version>
<lasta.job.version>0.5.2</lasta.job.version>
<mailflute.version>0.5.8</mailflute.version>
<!-- Partner Library -->
<slf4j.version>1.7.25</slf4j.version>
- <log4j.version>2.8.2</log4j.version>
- <jackson.version>2.9.2</jackson.version>
+ <log4j.version>2.9.1</log4j.version>
+ <jackson.version>2.8.6</jackson.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<asm.version>5.1</asm.version>
@@ -63,10 +63,10 @@
<crawler.version>2.0.0-SNAPSHOT</crawler.version>
<!-- Suggest -->
- <suggest.version>6.0.0-SNAPSHOT</suggest.version>
+ <suggest.version>6.1.0-SNAPSHOT</suggest.version>
<!-- Elasticsearch -->
- <elasticsearch.version>6.0.1</elasticsearch.version>
+ <elasticsearch.version>6.1.1</elasticsearch.version>
<elasticsearch.min.version>6.0.0</elasticsearch.min.version>
<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
@@ -1209,7 +1209,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>23.4-jre</version>
+ <version>23.6-jre</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
@@ -1245,7 +1245,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.6</version>
+ <version>3.7</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
diff --git a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
index 84d173a88..15ed9d971 100644
--- a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
@@ -83,13 +83,13 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
final Settings settings =
Settings.builder()
- .put(paramMap
- .entrySet()
- .stream()
- .filter(e -> e.getKey().startsWith(SETTINGS_PREFIX))
- .collect(
- Collectors.toMap(e -> e.getKey().replaceFirst("^settings\\.", StringUtil.EMPTY), e -> e.getValue())))
- .build();
+ .putProperties(
+ paramMap.entrySet()
+ .stream()
+ .filter(e -> e.getKey().startsWith(SETTINGS_PREFIX))
+ .collect(
+ Collectors.toMap(e -> e.getKey().replaceFirst("^settings\\.", StringUtil.EMPTY),
+ e -> e.getValue())), s -> s).build();
logger.info("Connecting to " + hostsStr + " with [" + settings.toDelimitedString(',') + "]");
final TransportAddress[] addresses = split(hostsStr, ",").get(stream -> stream.map(h -> {
final String[] values = h.trim().split(":");
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 61b6a5ed1..d5a5d27b6 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -257,7 +257,7 @@ public class FessEsClient implements Client {
settingsBuilder.put("path.plugins", new File(System.getProperty("user.dir"), "plugins").getAbsolutePath());
}
if (settings != null) {
- settingsBuilder.put(settings);
+ settingsBuilder.putProperties(settings, s -> s);
}
});
runner.build(config);
--
GitLab