Bump version 3.0.0-alpha1-SNAPSHOT (#1904)

* Bump version 3.0.0-alpha1-SNAPSHOT Signed-off-by: Paul Sebastian <[email protected]> * Update com.netflix.nebula.ospackage to 11.11.0 * update client and nodeclient imports Signed-off-by: Paul Sebastian <[email protected]> * reorder import for one batch Signed-off-by: Paul Sebastian <[email protected]> * reorder rest of imports Signed-off-by: Paul Sebastian <[email protected]> * bump bwc version to 2.20 Signed-off-by: Paul Sebastian <[email protected]> * fix lexographic ordering Signed-off-by: Paul Sebastian <[email protected]> --------- Signed-off-by: Paul Sebastian <[email protected]> Signed-off-by: Paul Sebastian <[email protected]>
opensearch-project · Feb 24, 2025 · 5d7f53b · 5d7f53b
1 parent 0578f52
commit 5d7f53b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         if (buildVersionQualifier) {
@@ -324,7 +324,7 @@ testClusters.integTest {
     setting 'path.repo', repo.absolutePath
 }
 
-String baseVersion = "2.19.0"
+String baseVersion = "2.20.0"
 String bwcVersion = baseVersion + ".0"
 String baseName = "obsBwcCluster"
 String bwcFilePath = "src/test/resources/bwc/"

diff --git a/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt b/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt
@@ -5,7 +5,6 @@
 package org.opensearch.observability
 
 import org.opensearch.action.ActionRequest
-import org.opensearch.client.Client
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.node.DiscoveryNodes
 import org.opensearch.cluster.service.ClusterService
@@ -36,6 +35,7 @@ import org.opensearch.rest.RestController
 import org.opensearch.rest.RestHandler
 import org.opensearch.script.ScriptService
 import org.opensearch.threadpool.ThreadPool
+import org.opensearch.transport.client.Client
 import org.opensearch.watcher.ResourceWatcherService
 import java.util.function.Supplier
 

diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt
@@ -7,11 +7,11 @@ package org.opensearch.observability.action
 
 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.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Create ObservabilityObject transport action

diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt
@@ -7,11 +7,11 @@ package org.opensearch.observability.action
 
 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.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Delete ObservabilityObject transport action

diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt
@@ -7,11 +7,11 @@ package org.opensearch.observability.action
 
 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.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get ObservabilityObject transport action

diff --git a/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt b/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt
@@ -13,7 +13,6 @@ import org.opensearch.OpenSearchStatusException
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
-import org.opensearch.client.Client
 import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.action.ActionListener
@@ -29,6 +28,7 @@ import org.opensearch.observability.security.SecurityAccess
 import org.opensearch.observability.util.logger
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 import java.io.IOException
 
 abstract class PluginBaseAction<Request : ActionRequest, Response : ActionResponse>(

diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt
@@ -7,11 +7,11 @@ package org.opensearch.observability.action
 
 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.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Update ObservabilityObject transport action

diff --git a/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt b/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt
@@ -18,7 +18,6 @@ import org.opensearch.action.get.MultiGetRequest
 import org.opensearch.action.index.IndexRequest
 import org.opensearch.action.search.SearchRequest
 import org.opensearch.action.update.UpdateRequest
-import org.opensearch.client.Client
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
@@ -42,6 +41,7 @@ import org.opensearch.observability.util.SecureIndexClient
 import org.opensearch.observability.util.logger
 import org.opensearch.search.SearchHit
 import org.opensearch.search.builder.SearchSourceBuilder
+import org.opensearch.transport.client.Client
 import java.util.concurrent.TimeUnit
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/resthandler/ObservabilityRestHandler.kt b/src/main/kotlin/org/opensearch/observability/resthandler/ObservabilityRestHandler.kt
@@ -4,7 +4,6 @@
  */
 package org.opensearch.observability.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.observability.ObservabilityPlugin.Companion.BASE_OBSERVABILITY_URI
@@ -39,6 +38,7 @@ import org.opensearch.rest.RestRequest.Method.GET
 import org.opensearch.rest.RestRequest.Method.POST
 import org.opensearch.rest.RestRequest.Method.PUT
 import org.opensearch.search.sort.SortOrder
+import org.opensearch.transport.client.node.NodeClient
 import java.util.EnumSet
 
 /**

diff --git a/src/main/kotlin/org/opensearch/observability/resthandler/ObservabilityStatsRestHandler.kt b/src/main/kotlin/org/opensearch/observability/resthandler/ObservabilityStatsRestHandler.kt
@@ -1,6 +1,5 @@
 package org.opensearch.observability.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.observability.ObservabilityPlugin.Companion.BASE_OBSERVABILITY_URI
 import org.opensearch.observability.metrics.Metrics
@@ -10,6 +9,7 @@ import org.opensearch.rest.BytesRestResponse
 import org.opensearch.rest.RestHandler.Route
 import org.opensearch.rest.RestRequest
 import org.opensearch.rest.RestRequest.Method.GET
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Rest handler for getting observability backend stats

diff --git a/src/main/kotlin/org/opensearch/observability/util/SecureIndexClient.kt b/src/main/kotlin/org/opensearch/observability/util/SecureIndexClient.kt
@@ -34,11 +34,11 @@ import org.opensearch.action.termvectors.TermVectorsRequest
 import org.opensearch.action.termvectors.TermVectorsResponse
 import org.opensearch.action.update.UpdateRequest
 import org.opensearch.action.update.UpdateResponse
-import org.opensearch.client.Client
 import org.opensearch.common.action.ActionFuture
 import org.opensearch.common.util.concurrent.ThreadContext
 import org.opensearch.core.action.ActionListener
 import org.opensearch.core.action.ActionResponse
+import org.opensearch.transport.client.Client
 
 /**
  * Wrapper class on [Client] with security context removed.