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

elasticsearch 7.8.0

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-06-22 06:51:54 +09:00
parent 9149c4c0ef
commit c8c58d1a53
6 changed files with 36 additions and 39 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="es-7.7" />
<property name="branch.name" value="es-7.8" />
<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
<target name="mydbflute.check">

30
plugin.xml
View file

@ -13,48 +13,48 @@
<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="7.7.0" />
<param name="plugin.zip.version" value="7.7.0" />
<param name="plugin.version" value="7.8.0-SNAPSHOT" />
<param name="plugin.zip.version" value="7.8.0-20200621.120633-2" />
</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="7.7.0" />
<param name="plugin.zip.version" value="7.7.0" />
<param name="plugin.version" value="7.8.0-SNAPSHOT" />
<param name="plugin.zip.version" value="7.8.0-20200621.121626-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="7.7.0" />
<param name="plugin.zip.version" value="7.7.0" />
<param name="plugin.version" value="7.8.0-SNAPSHOT" />
<param name="plugin.zip.version" value="7.8.0-20200621.122210-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="7.7.0" />
<param name="plugin.zip.version" value="7.7.0" />
<param name="plugin.version" value="7.8.0-SNAPSHOT" />
<param name="plugin.zip.version" value="7.8.0-20200619.213931-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="7.7.0" />
<param name="plugin.zip.version" value="7.7.0" />
<param name="plugin.version" value="7.8.0-SNAPSHOT" />
<param name="plugin.zip.version" value="7.8.0-20200619.215156-1" />
</antcall>
<antcall target="remove.jars" />

26
pom.xml
View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.codelibs.fess</groupId>
<artifactId>fess</artifactId>
<version>13.7.2-SNAPSHOT</version>
<version>13.8.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Fess</name>
<description>Fess is Full tExt Search System.</description>
@ -35,12 +35,12 @@
</parent>
<properties>
<!-- Main Framework -->
<dbflute.version>1.2.2</dbflute.version>
<lastaflute.version>1.1.6</lastaflute.version>
<dbflute.version>1.2.3</dbflute.version>
<lastaflute.version>1.1.7</lastaflute.version>
<lasta.di.version>0.8.2</lasta.di.version>
<lasta.taglib.version>0.7.3</lasta.taglib.version>
<lasta.job.version>0.5.4</lasta.job.version>
<mailflute.version>0.6.1</mailflute.version>
<mailflute.version>0.6.3</mailflute.version>
<!-- Partner Library -->
<slf4j.version>1.7.30</slf4j.version>
@ -49,23 +49,23 @@
<commons.fileupload.version>1.4</commons.fileupload.version>
<asm.version>8.0.1</asm.version>
<tika.version>1.24.1</tika.version>
<groovy.version>3.0.3</groovy.version>
<groovy.version>3.0.4</groovy.version>
<minio.version>7.0.2</minio.version>
<okhttp.version>3.14.8</okhttp.version>
<okhttp.version>3.14.9</okhttp.version>
<!-- Crawler -->
<crawler.version>3.7.2-SNAPSHOT</crawler.version>
<crawler.version>3.8.0-SNAPSHOT</crawler.version>
<!-- Suggest -->
<suggest.version>7.7.0</suggest.version>
<suggest.version>7.8.0-SNAPSHOT</suggest.version>
<!-- Elasticsearch -->
<elasticsearch.version>7.7.1</elasticsearch.version>
<elasticsearch.httpclient.version>7.7.0</elasticsearch.httpclient.version>
<elasticsearch.version>7.8.0</elasticsearch.version>
<elasticsearch.httpclient.version>7.8.0</elasticsearch.httpclient.version>
<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>9.0.35</tomcat.version>
<tomcat.version>9.0.36</tomcat.version>
<tomcat.boot.version>0.7.5</tomcat.boot.version>
<!-- Testing -->
@ -1036,7 +1036,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.30.1</version>
<version>2.31</version>
<exclusions>
<exclusion>
<groupId>jakarta.annotation</groupId>
@ -1243,7 +1243,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

4
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -138,7 +138,7 @@ import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.AdminClient;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.document.DocumentField;
import org.elasticsearch.common.settings.Settings;
@ -412,7 +412,7 @@ public class FessEsClient implements Client {
final GetMappingsResponse getMappingsResponse =
client.admin().indices().prepareGetMappings(indexName).execute().actionGet(fessConfig.getIndexIndicesTimeout());
final ImmutableOpenMap<String, MappingMetaData> indexMappings = getMappingsResponse.mappings().get(indexName);
final ImmutableOpenMap<String, MappingMetadata> indexMappings = getMappingsResponse.mappings().get(indexName);
if (indexMappings == null || !indexMappings.containsKey("properties")) {
String source = null;
final String mappingFile = indexConfigPath + "/" + index + "/" + docType + ".json";

5
src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
View file

@ -181,10 +181,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
String stats = null;
try {
final FessEsClient esClient = ComponentUtil.getFessEsClient();
final NodesStatsResponse response =
esClient.admin().cluster().prepareNodesStats().setIngest(false).setBreaker(false).setDiscovery(false).setFs(true)
.setHttp(true).setIndices(true).setJvm(true).setOs(true).setProcess(true).setScript(false).setThreadPool(true)
.setTransport(true).execute().actionGet(10000L);
final NodesStatsResponse response = esClient.admin().cluster().prepareNodesStats().all().execute().actionGet(10000L);
final XContentBuilder builder = XContentFactory.jsonBuilder();
builder.startObject();
response.toXContent(builder, ToXContent.EMPTY_PARAMS);

8
src/main/java/org/codelibs/fess/util/UpgradeUtil.java
View file

@ -27,14 +27,14 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.xcontent.XContentType;
@ -93,7 +93,7 @@ public final class UpgradeUtil {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final GetMappingsResponse getMappingsResponse =
indicesClient.prepareGetMappings(index).execute().actionGet(fessConfig.getIndexIndicesTimeout());
final ImmutableOpenMap<String, MappingMetaData> indexMappings = getMappingsResponse.mappings().get(index);
final ImmutableOpenMap<String, MappingMetadata> indexMappings = getMappingsResponse.mappings().get(index);
if (indexMappings == null || !indexMappings.containsKey(type)) {
String source = null;
final String mappingFile = indexResourcePath + "/" + type + ".json";
@ -124,7 +124,7 @@ public final class UpgradeUtil {
final String field, final String source) {
final GetFieldMappingsResponse gfmResponse =
indicesClient.prepareGetFieldMappings(index).addTypes(type).setFields(field).execute().actionGet();
final FieldMappingMetaData fieldMappings = gfmResponse.fieldMappings(index, type, field);
final FieldMappingMetadata fieldMappings = gfmResponse.fieldMappings(index, type, field);
if (fieldMappings == null || fieldMappings.isNull()) {
try {
final AcknowledgedResponse pmResponse =