diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index befafc50e..4594e1f9b 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -32,8 +32,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 publishPluginZipPublicationToSnapshotsRepository diff --git a/build.gradle b/build.gradle index c800b66f6..96aa2593a 100644 --- a/build.gradle +++ b/build.gradle @@ -73,8 +73,7 @@ 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() maven { url = "https://plugins.gradle.org/m2/" } } @@ -118,8 +117,7 @@ tasks.withType(AbstractArchiveTask).configureEach { 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() maven { url = "https://plugins.gradle.org/m2/" } maven { url = "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } @@ -304,10 +302,11 @@ publishing { repositories { 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") } } }