0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #861 elasticsearch 5.2 support

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-02-02 15:22:10 +09:00
parent e8b4ed2c3b
commit a3253d6adc
4 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dbflute.xml
View file

@ -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="master" />
<property name="branch.name" value="es-5.2" />
<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
<target name="mydbflute.check">

36
plugin.xml
View file

@ -15,57 +15,57 @@
<mkdir dir="${plugins.dir}" />
<!-- 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="5.1.0" />
<param name="plugin.zip.version" value="5.1.0" />
<param name="plugin.version" value="5.2.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.2.0-20170202.050617-1" />
</antcall>
<!-- analysis-ja -->
<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-ja" />
<param name="plugin.version" value="5.1.0" />
<param name="plugin.zip.version" value="5.1.0" />
<param name="plugin.version" value="5.2.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.2.0-20170202.050940-1" />
</antcall>
<!-- analysis-synonym -->
<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-synonym" />
<param name="plugin.version" value="5.1.0" />
<param name="plugin.zip.version" value="5.1.0" />
<param name="plugin.version" value="5.2.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.2.0-20170202.051828-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="5.1.0" />
<param name="plugin.zip.version" value="5.1.0" />
<param name="plugin.version" value="5.2.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.2.0-20170202.052019-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="5.1.0" />
<param name="plugin.zip.version" value="5.1.0" />
<param name="plugin.version" value="5.2.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.2.0-20170202.052320-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="5.1.0" />
<param name="plugin.zip.version" value="5.1.0" />
<param name="plugin.version" value="5.2.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.2.0-20170202.052500-1" />
</antcall>
<!-- kopf -->
<get dest="${target.dir}/kopf.zip">

10
pom.xml
View file

@ -60,15 +60,15 @@
<crawler.version>1.1.0-SNAPSHOT</crawler.version>
<!-- Suggest -->
<suggest.version>5.1.0-SNAPSHOT</suggest.version>
<suggest.version>5.2.0-SNAPSHOT</suggest.version>
<!-- Elasticsearch -->
<elasticsearch.version>5.1.2</elasticsearch.version>
<elasticsearch.version>5.2.0</elasticsearch.version>
<elasticsearch.min.version>5.1.0</elasticsearch.min.version>
<cluster.runner.version>5.1.2.1-SNAPSHOT</cluster.runner.version>
<cluster.runner.version>5.2.0.0-SNAPSHOT</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>8.5.9</tomcat.version>
<tomcat.version>8.5.11</tomcat.version>
<tomcat.boot.version>0.5.1</tomcat.boot.version>
<!-- DEB & RPM build -->
@ -98,7 +98,7 @@
</resource>
</resources>
<!-- This file contains all the common properties used to build the different
<!-- This file contains all the common properties used to build the different
packages (tar.gz, deb, rpm) using Maven resources plugin -->
<filters>
<filter>src/packaging/common/packaging.properties</filter>

3
src/main/java/org/codelibs/fess/ds/impl/GitBucketDataStoreImpl.java
View file

@ -36,6 +36,7 @@ import org.codelibs.fess.es.config.exentity.CrawlingConfigWrapper;
import org.codelibs.fess.es.config.exentity.DataConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -199,7 +200,7 @@ public class GitBucketDataStoreImpl extends AbstractDataStoreImpl {
private List<Object> parseList(final InputStream is) { // TODO This function should be moved to CurlResponse
try {
return JsonXContent.jsonXContent.createParser(is).list();
return JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY, is).list();
} catch (final Exception e) {
logger.warn("Failed to parse a list.", e);
return Collections.emptyList();