From a2791d6764f5ea6bdf8ee02d7718a22354a1d72d Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 15 Oct 2025 13:17:57 -0400 Subject: [PATCH 1/2] Onboard to s3 snapshots Signed-off-by: Darshit Chanpura --- .github/workflows/maven-publish.yml | 10 ++++++++-- build-tools/repositories.gradle | 2 +- build.gradle | 2 +- client/build.gradle | 9 +++++---- common/build.gradle | 9 +++++---- plugin/build.gradle | 9 +++++---- spi/build.gradle | 11 ++++++----- 7 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index bc76a28a7d..865e8acd89 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -33,8 +33,14 @@ 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: | diff --git a/build-tools/repositories.gradle b/build-tools/repositories.gradle index 4f58bef50a..d4de2fbdc4 100644 --- a/build-tools/repositories.gradle +++ b/build-tools/repositories.gradle @@ -5,7 +5,7 @@ repositories { mavenLocal() - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() maven {url 'https://oss.sonatype.org/content/repositories/snapshots/'} diff --git a/build.gradle b/build.gradle index a2d0517aa9..f85e468c48 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ buildscript { repositories { mavenLocal() - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() maven { url "https://plugins.gradle.org/m2/" } diff --git a/client/build.gradle b/client/build.gradle index e592cd24ff..b2d5fbf8fe 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -72,10 +72,11 @@ publishing { } maven { name = "Snapshots" - url = "https://central.sonatype.com/repository/maven-snapshots/" - credentials { - username "$System.env.SONATYPE_USERNAME" - password "$System.env.SONATYPE_PASSWORD" + url = System.getenv("MAVEN_SNAPSHOTS_S3_REPO") + credentials(AwsCredentials) { + accessKey = System.getenv("AWS_ACCESS_KEY_ID") + secretKey = System.getenv("AWS_SECRET_ACCESS_KEY") + sessionToken = System.getenv("AWS_SESSION_TOKEN") } } } diff --git a/common/build.gradle b/common/build.gradle index 67ce8dbe68..5cbf100289 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -113,10 +113,11 @@ publishing { } maven { name = "Snapshots" // optional target repository name - url = "https://central.sonatype.com/repository/maven-snapshots/" - credentials { - username "$System.env.SONATYPE_USERNAME" - password "$System.env.SONATYPE_PASSWORD" + url = System.getenv("MAVEN_SNAPSHOTS_S3_REPO") + credentials(AwsCredentials) { + accessKey = System.getenv("AWS_ACCESS_KEY_ID") + secretKey = System.getenv("AWS_SECRET_ACCESS_KEY") + sessionToken = System.getenv("AWS_SESSION_TOKEN") } } } diff --git a/plugin/build.gradle b/plugin/build.gradle index 57138307b1..e2ef299232 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -163,10 +163,11 @@ publishing { mavenCentral() maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } name = "Snapshots" - url = "https://central.sonatype.com/repository/maven-snapshots/" - credentials { - username "$System.env.SONATYPE_USERNAME" - password "$System.env.SONATYPE_PASSWORD" + url = System.getenv("MAVEN_SNAPSHOTS_S3_REPO") + credentials(AwsCredentials) { + accessKey = System.getenv("AWS_ACCESS_KEY_ID") + secretKey = System.getenv("AWS_SECRET_ACCESS_KEY") + sessionToken = System.getenv("AWS_SESSION_TOKEN") } } } diff --git a/spi/build.gradle b/spi/build.gradle index c617131c2a..7550e07477 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'opensearch.java' repositories { mavenLocal() mavenCentral() - maven { url "https://central.sonatype.com/repository/maven-snapshots/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } @@ -97,10 +97,11 @@ publishing { } maven { name = "Snapshots" // optional target repository name - url = "https://central.sonatype.com/repository/maven-snapshots/" - credentials { - username "$System.env.SONATYPE_USERNAME" - password "$System.env.SONATYPE_PASSWORD" + url = System.getenv("MAVEN_SNAPSHOTS_S3_REPO") + credentials(AwsCredentials) { + accessKey = System.getenv("AWS_ACCESS_KEY_ID") + secretKey = System.getenv("AWS_SECRET_ACCESS_KEY") + sessionToken = System.getenv("AWS_SESSION_TOKEN") } } } From e1450434a196c97ac73a52f2ed2615a94da8033f Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Wed, 15 Oct 2025 14:04:50 -0400 Subject: [PATCH 2/2] Remove oss sonatype maven reference Signed-off-by: Darshit Chanpura --- build-tools/repositories.gradle | 1 - build.gradle | 1 - spi/build.gradle | 1 - 3 files changed, 3 deletions(-) diff --git a/build-tools/repositories.gradle b/build-tools/repositories.gradle index d4de2fbdc4..b0152e2489 100644 --- a/build-tools/repositories.gradle +++ b/build-tools/repositories.gradle @@ -6,7 +6,6 @@ repositories { mavenLocal() maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() maven {url 'https://oss.sonatype.org/content/repositories/snapshots/'} maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } diff --git a/build.gradle b/build.gradle index f85e468c48..2ec6086791 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,6 @@ buildscript { repositories { mavenLocal() maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() maven { url "https://plugins.gradle.org/m2/" } maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } diff --git a/spi/build.gradle b/spi/build.gradle index 7550e07477..229aaeaec5 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -19,7 +19,6 @@ repositories { mavenLocal() mavenCentral() maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } ext {