Fix main CI upstream opensearch imports and use maven repo instead of…

… jenkins (#1437) * fix ci failures on main Signed-off-by: Derek Ho <[email protected]> * change back some references Signed-off-by: Derek Ho <[email protected]> * fix up Signed-off-by: Derek Ho <[email protected]> * try incrementing bwc version to 2.7 Signed-off-by: Derek Ho <[email protected]> * keep 2.6 Signed-off-by: Derek Ho <[email protected]> * try using maven Signed-off-by: Derek Ho <[email protected]> * fix zxip Signed-off-by: Derek Ho <[email protected]> * fix version Signed-off-by: Derek Ho <[email protected]> * fix snapshot Signed-off-by: Derek Ho <[email protected]> * remove job scheduler url reef Signed-off-by: Derek Ho <[email protected]> * add base version Signed-off-by: Derek Ho <[email protected]> * hard code Signed-off-by: Derek Ho <[email protected]> * try configuration zip Signed-off-by: Derek Ho <[email protected]> * try zip archive Signed-off-by: Derek Ho <[email protected]> * move dep Signed-off-by: Derek Ho <[email protected]> * fix imports Signed-off-by: Derek Ho <[email protected]> * fix last file Signed-off-by: Derek Ho <[email protected]> * add back job scheduler bwc Signed-off-by: Derek Ho <[email protected]> * add zip archive Signed-off-by: Derek Ho <[email protected]> * move ot 2.7.0 bwc Signed-off-by: Derek Ho <[email protected]> * hard code link Signed-off-by: Derek Ho <[email protected]> --------- Signed-off-by: Derek Ho <[email protected]>
opensearch-project · Mar 7, 2023 · 18cd844 · 18cd844
1 parent a0bce50
commit 18cd844
Show file tree

Hide file tree

Showing 35 changed files with 93 additions and 108 deletions.
diff --git a/build.gradle b/build.gradle
@@ -110,6 +110,7 @@ allOpen {
 
 configurations {
     ktlint
+    zipArchive
 }
 
 detekt {
@@ -162,6 +163,7 @@ allprojects {
 }
 
 dependencies {
+    zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
     implementation "org.opensearch:opensearch:${opensearch_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
@@ -286,7 +288,6 @@ integTest {
 Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
 integTest.dependsOn(bundle)
 integTest.getClusters().forEach { c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile())) }
-String jobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/" + opensearch_version.replace("-SNAPSHOT", "") + "/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-" + opensearch_build.replace("-SNAPSHOT", "") + ".zip"
 
 testClusters.integTest {
     testDistribution = "INTEG_TEST"
@@ -297,15 +298,7 @@ testClusters.integTest {
             return new RegularFile() {
                 @Override
                 File getAsFile() {
-                    File dir = new File("src/test/resources/job-scheduler")
-                    if (!dir.exists()) {
-                        dir.mkdirs()
-                    }
-                    File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip")
-                    if (!file.exists()) {
-                        new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
-                    }
-                    return fileTree("src/test/resources/job-scheduler").getSingleFile()
+                    return configurations.zipArchive.asFileTree.getSingleFile()
                 }
             }
         }
@@ -326,14 +319,14 @@ testClusters.integTest {
     setting 'path.repo', repo.absolutePath
 }
 
-String baseVersion = "2.6.0"
+String baseVersion = "2.7.0"
 String bwcVersion = baseVersion + ".0"
 String baseName = "obsBwcCluster"
 String bwcFilePath = "src/test/resources/bwc/"
 String bwcObservabilityPlugin = "opensearch-observability-" + bwcVersion + ".zip"
 String bwcJobSchedulerPlugin = "opensearch-job-scheduler-" + bwcVersion + ".zip" 
-String remoteFileURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${baseVersion}/latest/linux/x64/tar/builds/opensearch/plugins/" + bwcObservabilityPlugin
-String bwcJobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${baseVersion}/latest/linux/x64/tar/builds/opensearch/plugins/" + bwcJobSchedulerPlugin
+String remoteFileURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-observability/2.7.0.0-SNAPSHOT/opensearch-observability-2.7.0.0-20230307.002038-1.zip"
+String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-job-scheduler/2.7.0.0-SNAPSHOT/opensearch-job-scheduler-2.7.0.0-20230307.020232-12.zip"
 
 2.times {i ->
     testClusters {
@@ -398,15 +391,7 @@ task prepareBwcTests {
                         return new RegularFile() {
                             @Override
                             File getAsFile() {
-                                File dir = new File(bwcFilePath + "job-scheduler/" + project.version)
-                                if (!dir.exists()) {
-                                    dir.mkdirs()
-                                }
-                                File file = new File(dir, "opensearch-job-scheduler-" + project.version + ".zip")
-                                if (!file.exists()) {
-                                    new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
-                                }
-                                return fileTree(bwcFilePath + "job-scheduler/" + project.version).getSingleFile()
+                                return configurations.zipArchive.asFileTree.getSingleFile()
                             }
                         }
                     }

diff --git a/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt b/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt
@@ -16,7 +16,7 @@ import org.opensearch.common.settings.IndexScopedSettings
 import org.opensearch.common.settings.Setting
 import org.opensearch.common.settings.Settings
 import org.opensearch.common.settings.SettingsFilter
-import org.opensearch.common.xcontent.NamedXContentRegistry
+import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.env.Environment
 import org.opensearch.env.NodeEnvironment
 import org.opensearch.jobscheduler.spi.JobSchedulerExtension

diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt
@@ -9,8 +9,8 @@ import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.xcontent.NamedXContentRegistry
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt
@@ -10,13 +10,13 @@ import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.ToXContentObject
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContentObject
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.BaseObjectData
 import org.opensearch.observability.model.ObservabilityObjectDataProperties
 import org.opensearch.observability.model.ObservabilityObjectType

diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt
@@ -8,11 +8,11 @@ package org.opensearch.observability.action
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD
 import java.io.IOException

diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt
@@ -9,8 +9,8 @@ import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.xcontent.NamedXContentRegistry
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt
@@ -11,13 +11,13 @@ import org.opensearch.action.ValidateActions
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.ToXContentObject
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContentObject
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD
 import org.opensearch.observability.model.RestTag.OBJECT_ID_LIST_FIELD

diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt
@@ -8,15 +8,15 @@ package org.opensearch.observability.action
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.enumReader
 import org.opensearch.commons.utils.enumWriter
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.observability.model.RestTag.DELETE_RESPONSE_LIST_TAG
 import org.opensearch.rest.RestStatus

diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt
@@ -9,8 +9,8 @@ import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.xcontent.NamedXContentRegistry
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt
@@ -11,10 +11,6 @@ import org.opensearch.action.ValidateActions
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.ToXContentObject
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
@@ -23,6 +19,10 @@ import org.opensearch.commons.utils.enumSet
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContentObject
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.ObservabilityObjectType
 import org.opensearch.observability.model.RestTag.FILTER_PARAM_LIST_FIELD
 import org.opensearch.observability.model.RestTag.FROM_INDEX_FIELD

diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectResponse.kt
@@ -8,9 +8,9 @@ package org.opensearch.observability.action
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.observability.model.ObservabilityObjectSearchResult
 import org.opensearch.observability.model.RestTag

diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt
@@ -9,8 +9,8 @@ import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
-import org.opensearch.common.xcontent.NamedXContentRegistry
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt
@@ -12,13 +12,13 @@ import org.opensearch.common.Strings
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.ToXContentObject
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContentObject
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.BaseObjectData
 import org.opensearch.observability.model.ObservabilityObjectDataProperties
 import org.opensearch.observability.model.ObservabilityObjectType

diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt
@@ -7,11 +7,11 @@ package org.opensearch.observability.action
 
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
-import org.opensearch.common.xcontent.XContentParser
-import org.opensearch.common.xcontent.XContentParser.Token
 import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParser.Token
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD

diff --git a/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt b/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt
@@ -22,8 +22,8 @@ import org.opensearch.client.Client
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
-import org.opensearch.common.xcontent.NamedXContentRegistry
 import org.opensearch.common.xcontent.XContentType
+import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.index.IndexNotFoundException
 import org.opensearch.index.query.QueryBuilders
 import org.opensearch.index.reindex.ReindexAction

diff --git a/src/main/kotlin/org/opensearch/observability/model/Application.kt b/src/main/kotlin/org/opensearch/observability/model/Application.kt
@@ -8,12 +8,12 @@ package org.opensearch.observability.model
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/model/BaseModel.kt b/src/main/kotlin/org/opensearch/observability/model/BaseModel.kt
@@ -6,7 +6,7 @@
 package org.opensearch.observability.model
 
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContent
 
 /**
  * interface for representing objects.

diff --git a/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt b/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt
@@ -7,10 +7,10 @@ package org.opensearch.observability.model
 
 import org.opensearch.action.ActionResponse
 import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.ToXContentObject
-import org.opensearch.common.xcontent.XContentBuilder
 import org.opensearch.common.xcontent.XContentFactory
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContentObject
+import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.rest.RestStatus
 import java.io.IOException
 

diff --git a/src/main/kotlin/org/opensearch/observability/model/Notebook.kt b/src/main/kotlin/org/opensearch/observability/model/Notebook.kt
@@ -8,11 +8,11 @@ package org.opensearch.observability.model
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDataProperties.kt b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDataProperties.kt
@@ -6,7 +6,7 @@
 package org.opensearch.observability.model
 
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParser
 
 internal object ObservabilityObjectDataProperties {
     /**

diff --git a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt
@@ -8,13 +8,13 @@ package org.opensearch.observability.model
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.ObservabilityObjectDataProperties.getReaderForObjectType
 import org.opensearch.observability.model.RestTag.ACCESS_LIST_FIELD
 import org.opensearch.observability.model.RestTag.CREATED_TIME_FIELD

diff --git a/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt b/src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt
@@ -8,7 +8,7 @@ package org.opensearch.observability.model
 import org.apache.lucene.search.TotalHits
 import org.opensearch.action.search.SearchResponse
 import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.RestTag.OBJECT_LIST_FIELD
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt b/src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt
@@ -8,11 +8,11 @@ package org.opensearch.observability.model
 import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentBuilder
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParser
 import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

diff --git a/src/main/kotlin/org/opensearch/observability/model/RestTag.kt b/src/main/kotlin/org/opensearch/observability/model/RestTag.kt
@@ -4,8 +4,8 @@
  */
 package org.opensearch.observability.model
 
-import org.opensearch.common.xcontent.ToXContent
-import org.opensearch.common.xcontent.ToXContent.Params
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.ToXContent.Params
 
 /**
  * Plugin Rest common Tags.