[pull] main from opensearch-project:main

.github/workflows/publish-snapshots.yml

@@ -27,8 +27,13 @@ jobs:
           export-env: true
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          SONATYPE_USERNAME: op://opensearch-infra-secrets/maven-central-portal-credentials/username
-          SONATYPE_PASSWORD: op://opensearch-infra-secrets/maven-central-portal-credentials/password
+          MAVEN_SNAPSHOTS_S3_REPO: op://opensearch-infra-secrets/maven-snapshots-s3/repo
+          MAVEN_SNAPSHOTS_S3_ROLE: op://opensearch-infra-secrets/maven-snapshots-s3/role
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: ${{ env.MAVEN_SNAPSHOTS_S3_ROLE }}
+          aws-region: us-east-1
       - name: publish snapshots to maven
         run: |
-          ./gradlew --no-daemon publishPublishMavenPublicationToSnapshotsRepository
+          ./gradlew --no-daemon publishPublishMavenPublicationToSnapshotsRepository

README.md

@@ -53,7 +53,7 @@ This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUC
 See [User Guide](USER_GUIDE.md).
 
 ## Snapshot Builds
-The [snapshots builds](https://central.sonatype.com/repository/maven-snapshots/org/opensearch/client/opensearch-java/maven-metadata.xml) are published to sonatype using [publish-snapshots.yml](./.github/workflows/publish-snapshots.yml) workflow. Each `push` event to the main branch triggers this workflow.
+The [snapshots builds](https://ci.opensearch.org/ci/dbc/snapshots/maven/org/opensearch/client/opensearch-java/maven-metadata.xml) are published to sonatype using [publish-snapshots.yml](./.github/workflows/publish-snapshots.yml) workflow. Each `push` event to the main branch triggers this workflow.
 
 ## Compatibility with OpenSearch
 

build.gradle.kts

@@ -38,8 +38,7 @@ allprojects {
 
     repositories {
         mavenLocal()
-        maven(url = "https://central.sonatype.com/repository/maven-snapshots/")
-        maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots")
+        maven(url = "https://ci.opensearch.org/ci/dbc/snapshots/maven/")
         mavenCentral()
         gradlePluginPortal()
     }

java-client/build.gradle.kts

@@ -38,8 +38,7 @@ import java.io.FileWriter
 buildscript {
     repositories {
         mavenLocal()
-        maven(url = "https://central.sonatype.com/repository/maven-snapshots/")
-        maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots")
+        maven(url = "https://ci.opensearch.org/ci/dbc/snapshots/maven/")
         mavenCentral()
         gradlePluginPortal()
     }
@@ -177,7 +176,7 @@ val integrationTest = task<Test>("integrationTest") {
             System.getProperty("tests.awsSdk2support.domainRegion", "us-east-1"))
 }
 
-val opensearchVersion = "3.0.0-beta1-SNAPSHOT"
+val opensearchVersion = "3.0.0-SNAPSHOT"
 
 dependencies {
     val jacksonVersion = "2.18.3"
@@ -318,11 +317,12 @@ tasks.withType<Jar> {
 publishing {
     repositories{
         if (version.toString().endsWith("SNAPSHOT")) {
-            maven("https://central.sonatype.com/repository/maven-snapshots/") {
+            maven(providers.environmentVariable("MAVEN_SNAPSHOTS_S3_REPO")) {
                 name = "Snapshots"
-                credentials {
-                    username = System.getenv("SONATYPE_USERNAME")
-                    password = System.getenv("SONATYPE_PASSWORD")
+		credentials(AwsCredentials::class) {
+                    accessKey = System.getenv("AWS_ACCESS_KEY_ID")
+                    secretKey = System.getenv("AWS_SECRET_ACCESS_KEY")
+                    sessionToken = System.getenv("AWS_SESSION_TOKEN")
                 }
             }
         }
@@ -405,4 +405,4 @@ if (runtimeJavaVersion >= JavaVersion.VERSION_21) {
     testImplementation("org.bouncycastle", "bcprov-lts8on", "2.73.6")
     testImplementation("org.bouncycastle", "bcpkix-lts8on", "2.73.6")
   }
-}
+}

java-codegen/build.gradle.kts

@@ -19,8 +19,7 @@ import java.io.FileWriter
 buildscript {
     repositories {
         mavenLocal()
-        maven(url = "https://central.sonatype.com/repository/maven-snapshots/")
-        maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots")
+        maven(url = "https://ci.opensearch.org/ci/dbc/snapshots/maven/")
         mavenCentral()
         gradlePluginPortal()
     }
@@ -266,4 +265,4 @@ tasks.withType<Jar> {
 
 spotlessConventions {
     eclipseFormatterConfigFile = rootProject.file("buildSrc/formatterConfig-generated.xml")
-}
+}