diff --git a/dbflute.xml b/dbflute.xml index 2d6185701..f2bb4d359 100644 --- a/dbflute.xml +++ b/dbflute.xml @@ -2,7 +2,7 @@ - + diff --git a/plugin.xml b/plugin.xml index 75cba6dfc..835824b8e 100644 --- a/plugin.xml +++ b/plugin.xml @@ -13,48 +13,48 @@ - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + diff --git a/pom.xml b/pom.xml index c28604233..271100277 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.codelibs.fess fess - 13.7.2-SNAPSHOT + 13.8.0-SNAPSHOT war Fess Fess is Full tExt Search System. @@ -35,12 +35,12 @@ - 1.2.2 - 1.1.6 + 1.2.3 + 1.1.7 0.8.2 0.7.3 0.5.4 - 0.6.1 + 0.6.3 1.7.30 @@ -49,23 +49,23 @@ 1.4 8.0.1 1.24.1 - 3.0.3 + 3.0.4 7.0.2 - 3.14.8 + 3.14.9 - 3.7.2-SNAPSHOT + 3.8.0-SNAPSHOT - 7.7.0 + 7.8.0-SNAPSHOT - 7.7.1 - 7.7.0 + 7.8.0 + 7.8.0 ${elasticsearch.version}.0 - 9.0.35 + 9.0.36 0.7.5 @@ -1036,7 +1036,7 @@ org.glassfish.jersey.core jersey-common - 2.30.1 + 2.31 jakarta.annotation @@ -1243,7 +1243,7 @@ commons-io commons-io - 2.6 + 2.7 org.apache.commons 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 ec9d37a46..24a98881a 100644 --- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java +++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java @@ -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 indexMappings = getMappingsResponse.mappings().get(indexName); + final ImmutableOpenMap indexMappings = getMappingsResponse.mappings().get(indexName); if (indexMappings == null || !indexMappings.containsKey("properties")) { String source = null; final String mappingFile = indexConfigPath + "/" + index + "/" + docType + ".json"; diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java index b990d4603..6e2ab5496 100644 --- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java +++ b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java @@ -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); diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java index d4ccb0976..c4414f589 100644 --- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java +++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java @@ -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 indexMappings = getMappingsResponse.mappings().get(index); + final ImmutableOpenMap 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 =