fix #2742 opensearch 2.7.0

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.6.0" />
+	<property name="opensearch.version" value="2.7.0" />
 
 	<target name="install.modules">
 		<mkdir dir="${target.dir}" />

plugin.xml

@@ -17,8 +17,8 @@
 			<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.6.0" />
-			<param name="plugin.zip.version" value="2.6.0" />
+			<param name="plugin.version" value="2.7.0" />
+			<param name="plugin.zip.version" value="2.7.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
@@ -26,8 +26,8 @@
 			<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.6.0" />
-			<param name="plugin.zip.version" value="2.6.0" />
+			<param name="plugin.version" value="2.7.0" />
+			<param name="plugin.zip.version" value="2.7.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
@@ -35,8 +35,8 @@
 			<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.6.0" />
-			<param name="plugin.zip.version" value="2.6.0" />
+			<param name="plugin.version" value="2.7.0" />
+			<param name="plugin.zip.version" value="2.7.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
@@ -44,8 +44,8 @@
 			<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.6.0" />
-			<param name="plugin.zip.version" value="2.6.0" />
+			<param name="plugin.version" value="2.7.0" />
+			<param name="plugin.zip.version" value="2.7.0" />
 		</antcall>
 
 		<antcall target="remove.jars" />

src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java

@@ -21,12 +21,12 @@ import java.util.Map;
 import java.util.Objects;
 
 import org.apache.lucene.search.Query;
-import org.opensearch.common.ParseField;
 import org.opensearch.common.io.stream.NamedWriteable;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.ObjectParser;
-import org.opensearch.common.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ObjectParser;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.query.AbstractQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryShardContext;

src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java

@@ -28,9 +28,9 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.monitor.jvm.JvmStats;
 import org.opensearch.monitor.jvm.JvmStats.BufferPool;
 import org.opensearch.monitor.jvm.JvmStats.Classes;

src/main/java/org/codelibs/fess/util/SearchEngineUtil.java

@@ -24,11 +24,11 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.lastaflute.di.exception.IORuntimeException;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.search.SearchHit;
 
 public final class SearchEngineUtil {