Skip to content

Commit 701fe1b

Browse files
[Release 3.0.0] Bump Version to 3.0.0-alpha1 and and updated shadowPlugin (#1384)
Co-authored-by: Peter Zhu <[email protected]>
1 parent 9553f96 commit 701fe1b

File tree

161 files changed

+238
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+238
-236
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit
2626
buildscript {
2727
ext {
2828
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
29-
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
30-
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
29+
opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
30+
buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
3131
// 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT
3232
version_tokens = opensearch_version.tokenize('-')
3333
opensearch_build = version_tokens[0] + '.0'
@@ -651,7 +651,7 @@ task integTestRemote(type: RestIntegTestTask) {
651651

652652
// === Set up BWC tests ===
653653

654-
String bwcVersionShort = "2.19.0"
654+
String bwcVersionShort = "2.20.0"
655655
String bwcVersion = bwcVersionShort + ".0"
656656
String baseName = "indexmanagementBwcCluster"
657657

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
45
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

spi/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.opensearch.gradle.test.RestIntegTestTask
66

77
plugins {
8-
id 'com.github.johnrengelman.shadow'
8+
id 'com.gradleup.shadow'
99
id 'jacoco'
1010
}
1111

@@ -25,15 +25,15 @@ ext {
2525
}
2626

2727
plugins.withId('java') {
28-
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
28+
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
2929
}
3030

3131
plugins.withId('org.jetbrains.kotlin.jvm') {
32-
compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_11
32+
compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_21
3333
}
3434

3535
jacoco {
36-
toolVersion = '0.8.7'
36+
toolVersion = '0.8.12'
3737
reportsDirectory = file("$buildDir/JacocoReport")
3838
}
3939

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/IndexMetadataService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement
77

8-
import org.opensearch.client.Client
98
import org.opensearch.cluster.service.ClusterService
109
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ISMIndexMetadata
10+
import org.opensearch.transport.client.Client
1111

1212
/**
1313
* ISM by default considers all the index metadata to be part of the cluster state,

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/StepContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
package org.opensearch.indexmanagement.spi.indexstatemanagement.model
77

8-
import org.opensearch.client.Client
98
import org.opensearch.cluster.service.ClusterService
109
import org.opensearch.common.settings.Settings
1110
import org.opensearch.common.util.concurrent.ThreadContext
1211
import org.opensearch.commons.authuser.User
1312
import org.opensearch.jobscheduler.spi.utils.LockService
1413
import org.opensearch.script.ScriptService
14+
import org.opensearch.transport.client.Client
1515

1616
class StepContext(
1717
val metadata: ManagedIndexMetaData,

src/main/kotlin/org/opensearch/indexmanagement/IndexManagementIndices.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ import org.opensearch.action.admin.indices.create.CreateIndexRequest
1616
import org.opensearch.action.admin.indices.create.CreateIndexResponse
1717
import org.opensearch.action.admin.indices.exists.indices.IndicesExistsRequest
1818
import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse
19-
import org.opensearch.action.support.master.AcknowledgedResponse
20-
import org.opensearch.client.Client
21-
import org.opensearch.client.IndicesAdminClient
19+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse
2220
import org.opensearch.cluster.service.ClusterService
2321
import org.opensearch.common.settings.Settings
2422
import org.opensearch.core.action.ActionListener
@@ -31,6 +29,8 @@ import org.opensearch.indexmanagement.indexstatemanagement.util.INDEX_NUMBER_OF_
3129
import org.opensearch.indexmanagement.opensearchapi.suspendUntil
3230
import org.opensearch.indexmanagement.util.IndexUtils
3331
import org.opensearch.indexmanagement.util.OpenForTesting
32+
import org.opensearch.transport.client.Client
33+
import org.opensearch.transport.client.IndicesAdminClient
3434
import kotlin.coroutines.resume
3535
import kotlin.coroutines.resumeWithException
3636
import kotlin.coroutines.suspendCoroutine

src/main/kotlin/org/opensearch/indexmanagement/IndexManagementPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.apache.logging.log4j.LogManager
99
import org.opensearch.action.ActionRequest
1010
import org.opensearch.action.support.ActionFilter
1111
import org.opensearch.action.support.ActiveShardsObserver
12-
import org.opensearch.client.Client
1312
import org.opensearch.cluster.metadata.IndexNameExpressionResolver
1413
import org.opensearch.cluster.node.DiscoveryNodes
1514
import org.opensearch.cluster.service.ClusterService
@@ -196,6 +195,7 @@ import org.opensearch.threadpool.ThreadPool
196195
import org.opensearch.transport.RemoteClusterService
197196
import org.opensearch.transport.TransportInterceptor
198197
import org.opensearch.transport.TransportService
198+
import org.opensearch.transport.client.Client
199199
import org.opensearch.watcher.ResourceWatcherService
200200
import java.util.function.Supplier
201201

src/main/kotlin/org/opensearch/indexmanagement/common/model/notification/Channel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
package org.opensearch.indexmanagement.common.model.notification
77

8-
import org.opensearch.client.Client
9-
import org.opensearch.client.node.NodeClient
108
import org.opensearch.commons.ConfigConstants
119
import org.opensearch.commons.authuser.User
1210
import org.opensearch.commons.notifications.NotificationsPluginInterface
@@ -22,6 +20,8 @@ import org.opensearch.core.xcontent.XContentParser
2220
import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken
2321
import org.opensearch.indexmanagement.opensearchapi.suspendUntil
2422
import org.opensearch.indexmanagement.util.SecurityUtils.Companion.generateUserString
23+
import org.opensearch.transport.client.Client
24+
import org.opensearch.transport.client.node.NodeClient
2525
import java.io.IOException
2626

2727
data class Channel(val id: String) :

src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/ControlCenterIndices.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import org.opensearch.ExceptionsHelper
99
import org.opensearch.ResourceAlreadyExistsException
1010
import org.opensearch.action.admin.indices.create.CreateIndexRequest
1111
import org.opensearch.action.admin.indices.create.CreateIndexResponse
12-
import org.opensearch.action.support.master.AcknowledgedResponse
13-
import org.opensearch.client.IndicesAdminClient
12+
import org.opensearch.action.support.clustermanager.AcknowledgedResponse
1413
import org.opensearch.cluster.service.ClusterService
1514
import org.opensearch.common.settings.Settings
1615
import org.opensearch.core.action.ActionListener
1716
import org.opensearch.indexmanagement.IndexManagementPlugin
1817
import org.opensearch.indexmanagement.indexstatemanagement.util.INDEX_HIDDEN
1918
import org.opensearch.indexmanagement.util.IndexUtils
19+
import org.opensearch.transport.client.IndicesAdminClient
2020

2121
class ControlCenterIndices(
2222
private val client: IndicesAdminClient,

src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/action/delete/TransportDeleteLRONConfigAction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import org.opensearch.action.delete.DeleteResponse
1111
import org.opensearch.action.support.ActionFilters
1212
import org.opensearch.action.support.HandledTransportAction
1313
import org.opensearch.action.support.WriteRequest
14-
import org.opensearch.client.node.NodeClient
1514
import org.opensearch.common.inject.Inject
1615
import org.opensearch.commons.ConfigConstants
1716
import org.opensearch.core.action.ActionListener
1817
import org.opensearch.indexmanagement.IndexManagementPlugin
1918
import org.opensearch.tasks.Task
2019
import org.opensearch.transport.TransportService
20+
import org.opensearch.transport.client.node.NodeClient
2121

2222
class TransportDeleteLRONConfigAction
2323
@Inject

0 commit comments

Comments
 (0)