sync up with opensearch 2.9

codelibs · Jul 27, 2023 · 4a1a9a4 · 4a1a9a4
1 parent 81e2943
commit 4a1a9a4
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 44 deletions.
diff --git a/module.xml b/module.xml
@@ -6,7 +6,7 @@
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://maven.codelibs.org/" />
 	<property name="maven.release.repo.url" value="https://maven.codelibs.org/" />
-	<property name="opensearch.version" value="2.8.0" />
+	<property name="opensearch.version" value="2.9.0" />
 
 	<target name="install.modules">
 		<mkdir dir="${target.dir}" />

diff --git a/plugin.xml b/plugin.xml
@@ -17,35 +17,35 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="2.8.0" />
-			<param name="plugin.zip.version" value="2.8.0" />
+			<param name="plugin.version" value="2.9.0" />
+			<param name="plugin.zip.version" value="2.9.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.8.0" />
-			<param name="plugin.zip.version" value="2.8.0" />
+			<param name="plugin.version" value="2.9.0" />
+			<param name="plugin.zip.version" value="2.9.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.8.0" />
-			<param name="plugin.zip.version" value="2.8.0" />
+			<param name="plugin.version" value="2.9.0" />
+			<param name="plugin.zip.version" value="2.9.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
 			<param name="repo.url" value="${maven.release.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="2.8.0" />
-			<param name="plugin.zip.version" value="2.8.0" />
+			<param name="plugin.version" value="2.9.0" />
+			<param name="plugin.zip.version" value="2.9.0" />
 		</antcall>
 
 		<antcall target="remove.jars" />

diff --git a/pom.xml b/pom.xml
@@ -1007,6 +1007,12 @@
 			<groupId>org.opensearch</groupId>
 			<artifactId>opensearch</artifactId>
 			<version>${opensearch.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.annotation</groupId>
+					<artifactId>jakarta.annotation-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.codelibs.opensearch</groupId>

diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
@@ -157,7 +157,6 @@
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.Settings.Builder;
@@ -550,7 +549,7 @@ public void addMapping(final String index, final String docType, final String in
 
         final GetMappingsResponse getMappingsResponse =
                 client.admin().indices().prepareGetMappings(indexName).execute().actionGet(fessConfig.getIndexIndicesTimeout());
-        final ImmutableOpenMap<String, MappingMetadata> indexMappings = getMappingsResponse.mappings();
+        final Map<String, MappingMetadata> indexMappings = getMappingsResponse.mappings();
         if (indexMappings == null || !indexMappings.containsKey("properties")) {
             String source = null;
             final String mappingFile = getResourcePath(indexConfigPath, fessConfig.getFesenType(), "/" + index + "/" + docType + ".json");

diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.util;
 
 import java.io.File;
+import java.util.Map;
 import java.util.function.Consumer;
 
 import org.apache.logging.log4j.LogManager;
@@ -35,7 +36,6 @@
 import org.opensearch.client.Client;
 import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.xcontent.XContentType;
 
 public final class UpgradeUtil {
@@ -93,7 +93,7 @@ public static boolean addMapping(final IndicesAdminClient indicesClient, final S
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         final GetMappingsResponse getMappingsResponse =
                 indicesClient.prepareGetMappings(index).execute().actionGet(fessConfig.getIndexIndicesTimeout());
-        final ImmutableOpenMap<String, MappingMetadata> indexMappings = getMappingsResponse.mappings();
+        final Map<String, MappingMetadata> indexMappings = getMappingsResponse.mappings();
         if (indexMappings == null || !indexMappings.containsKey("properties")) {
             String source = null;
             final String mappingFile = indexResourcePath + "/" + docType + ".json";

diff --git a/src/main/resources/fess_indices/fess/ja/mapping.txt b/src/main/resources/fess_indices/fess/ja/mapping.txt
@@ -1,19 +1,3 @@
-#
-#   Copyright (C) 2016 Shinji Ikeda All Rights Reserved.
-#   Copyright 2009-2017 CodeLibs Project
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
 \u0009 => \u0020
 \u000A => \u0020
 \u000B => \u0020

diff --git a/src/main/resources/fess_indices/fess/mapping.txt b/src/main/resources/fess_indices/fess/mapping.txt
@@ -1,18 +1,3 @@
-#   Copyright (C) 2016 Shinji Ikeda All Rights Reserved.
-#   Copyright 2009-2017 CodeLibs Project
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
 \u0009 => \u0020
 \u000A => \u0020
 \u000B => \u0020