Skip to content

Increment version to 3.3.0-SNAPSHOT #1573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 19, 2025
Merged

Increment version to 3.3.0-SNAPSHOT #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5290bb6
Increment version to 3.3.0-SNAPSHOT
opensearch-ci-bot Aug 14, 2025
19fbb02
Set testclustersDir
cwperks Aug 15, 2025
ae6d6f3
Use proper constructor
cwperks Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import org.opensearch.gradle.test.RestIntegTestTask
buildscript {
ext {
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
opensearch_version = System.getProperty("opensearch.version", "3.2.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
// e.g. 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
Expand Down Expand Up @@ -465,6 +465,7 @@ int endJmxPort = startJmxPort
integTest {
useCluster testClusters.leaderCluster
useCluster testClusters.followCluster
systemProperty 'testclusters.dir', project.layout.buildDirectory.get().file("testclusters").asFile.absolutePath
systemProperty "password", "admin" // setting it to `admin` explicitly since its a custom security setup

if(knnEnabled){
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/util/Extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ fun User.overrideFgacRole(fgacRole: String?): User? {
roles = listOf(fgacRole)
}
return User(this.name, this.backendRoles, roles,
this.customAttNames, this.requestedTenant)
mapOf<String, String>(), this.requestedTenant)
}

fun User.toInjectedUser(): String? {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SecurityContext {
const val OPENDISTRO_SECURITY_INJECTED_ROLES_VALIDATION = "opendistro_security_injected_roles_validation"
const val REPLICATION_PLUGIN_USER = "ccr_user"

val ADMIN_USER = User(REPLICATION_PLUGIN_USER, null, listOf("all_access"), null)
val ADMIN_USER = User(REPLICATION_PLUGIN_USER, null, listOf("all_access"), mapOf<String, String>())

val ALL_TRANSIENTS = listOf(ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES,
ConfigConstants.INJECTED_USER, OPENDISTRO_SECURITY_USER)
Expand Down
Loading