diff --git a/module.xml b/module.xml index 49bd7858d..d0eaee576 100644 --- a/module.xml +++ b/module.xml @@ -6,7 +6,7 @@ - + diff --git a/plugin.xml b/plugin.xml index 85c63392b..6a0611943 100644 --- a/plugin.xml +++ b/plugin.xml @@ -17,8 +17,8 @@ - - + + @@ -26,8 +26,8 @@ - - + + @@ -35,8 +35,8 @@ - - + + @@ -44,8 +44,8 @@ - - + + diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java index 7f9a20b48..bb3c2787b 100644 --- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java +++ b/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; diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java index 59c8bb5ce..49517fea1 100644 --- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java +++ b/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; diff --git a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java index bc40b795d..94d3f77a9 100644 --- a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java +++ b/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 {