fix #1483 elasticsearch 6.2.0

dbflute.xml

@@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="es-6.1" />
+	<property name="branch.name" value="es-6.2" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
 
 	<target name="mydbflute.check">

plugin.xml

@@ -6,7 +6,7 @@
 	<property name="kopf.branch" value="fess-6.0" />
 
 	<!-- Maven Repository -->
-	<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
+	<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/releases" />
 	<property name="maven.release.repo.url" value="http://central.maven.org/maven2" />
 
 	<target name="install.plugins">
@@ -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.1.0" />
-			<param name="plugin.zip.version" value="6.1.0" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</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.1.0" />
-			<param name="plugin.zip.version" value="6.1.0" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</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.1.0" />
-			<param name="plugin.zip.version" value="6.1.0" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</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.1.1" />
-			<param name="plugin.zip.version" value="6.1.1" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</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.1.0" />
-			<param name="plugin.zip.version" value="6.1.0" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</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.1.0" />
-			<param name="plugin.zip.version" value="6.1.0" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</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.1.0" />
-			<param name="plugin.zip.version" value="6.1.0" />
+			<param name="plugin.version" value="6.2.1" />
+			<param name="plugin.zip.version" value="6.2.1" />
 		</antcall>
 		<!-- kopf -->
 		<get dest="${target.dir}/kopf.zip">
@@ -119,48 +119,4 @@
 			</fileset>
 		</delete>
 	</target>
-<!--
-# Korean
-# Too old...
-PLUGIN_VERSION=5.1.1.1
-rm -rf plugins/analysis-seunjeon
-wget -O target/analysis-seunjeon.zip http://central.maven.org/maven2/org/bitbucket/eunjeon/elasticsearch-analysis-seunjeon/${PLUGIN_VERSION}/elasticsearch-analysis-seunjeon-${PLUGIN_VERSION}.zip
-unzip -d plugins/analysis-seunjeon target/analysis-seunjeon.zip
-mv plugins/analysis-seunjeon/elasticsearch/* plugins/analysis-seunjeon/
-
-# Japanese
-# https://github.com/codelibs/elasticsearch-analysis-kuromoji-neologd
-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
-mv plugins/analysis-kuromoji-neologd/elasticsearch/* plugins/analysis-kuromoji-neologd/
-
-# Vietnamese
-# https://github.com/duydo/elasticsearch-analysis-vietnamese
-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
-mv plugins/analysis-vietnamese/elasticsearch/* plugins/analysis-vietnamese/
-rm plugins/analysis-vietnamese/opennlp-tools-*.jar
-rm plugins/analysis-vietnamese/commons-io-*.jar
-rm plugins/analysis-vietnamese/opennlp-maxent-*.jar
-rm plugins/analysis-vietnamese/jwnl-*.jar
-
-# Simplified Chinese
-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
-mv plugins/analysis-smartcn/elasticsearch/* plugins/analysis-smartcn/
-
-# Traditional Chinese
-# https://github.com/medcl/elasticsearch-analysis-stconvert
-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
-mv plugins/analysis-stconvert/elasticsearch/* plugins/analysis-stconvert/
--->
 </project>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codelibs.fess</groupId>
 	<artifactId>fess</artifactId>
-	<version>12.0.3-SNAPSHOT</version>
+	<version>12.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Fess</name>
 	<description>Fess is Full tExt Search System.</description>
@@ -60,15 +60,15 @@
 		<utflute.version>0.8.5</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>2.0.2</crawler.version>
+		<crawler.version>2.1.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>6.1.1</suggest.version>
+		<suggest.version>6.2.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>6.1.3</elasticsearch.version>
+		<elasticsearch.version>6.2.0</elasticsearch.version>
 		<elasticsearch.min.version>6.0.0</elasticsearch.min.version>
-		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
+		<cluster.runner.version>${elasticsearch.version}.1</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>8.5.23</tomcat.version>
@@ -1164,6 +1164,10 @@
 					<groupId>org.elasticsearch.plugin</groupId>
 					<artifactId>parent-join-client</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>rank-eval-client</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -1209,7 +1213,29 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>23.6-jre</version>
+			<version>24.0-jre</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>animal-sniffer-annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.j2objc</groupId>
+					<artifactId>j2objc-annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.checkerframework</groupId>
+					<artifactId>checker-compat-qual</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.code.findbugs</groupId>
+					<artifactId>jsr305</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.errorprone</groupId>
+					<artifactId>error_prone_annotations</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.google.oauth-client</groupId>
@@ -1220,6 +1246,10 @@
 					<groupId>org.apache.httpcomponents</groupId>
 					<artifactId>httpclient</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.google.code.findbugs</groupId>
+					<artifactId>jsr305</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>