diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b190fb96c..24ab0aced 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,7 @@ name: Release on: push: + branches: [ maven-central-publishing ] tags: - v2.3.* - v2.4.* @@ -33,9 +34,9 @@ jobs: distribution: temurin java-version: ${{ matrix.version }} cache: maven - server-id: ossrh-awspring - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD + server-id: central + server-username: CENTRAL_TOKEN_USERNAME + server-password: CENTRAL_TOKEN_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Run tests @@ -43,7 +44,8 @@ jobs: - name: Deploy to Sonatype run: ./mvnw -V -Prelease,spring deploy -DskipTests env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }} + CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Upload to S3 diff --git a/.settings.xml b/.settings.xml index a729ede1b..2aede4925 100644 --- a/.settings.xml +++ b/.settings.xml @@ -2,9 +2,9 @@ - repo.spring.io - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} + central + ${env.CENTRAL_TOKEN_USERNAME} + ${env.CENTRAL_TOKEN_PASSWORD} diff --git a/pom.xml b/pom.xml index 19932388b..16a2bff87 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,15 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + + maven-compiler-plugin @@ -122,7 +131,7 @@ ${spotless.version} - + ${maven.multiModuleProjectDirectory}/eclipse-code-formatter.xml @@ -169,6 +178,10 @@ + + org.sonatype.central + central-publishing-maven-plugin + @@ -316,13 +329,6 @@ - - - ossrh-awspring - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - Apache License, Version 2.0 diff --git a/spring-cloud-aws-dependencies/pom.xml b/spring-cloud-aws-dependencies/pom.xml index f2b8355a6..87d82548f 100644 --- a/spring-cloud-aws-dependencies/pom.xml +++ b/spring-cloud-aws-dependencies/pom.xml @@ -353,6 +353,15 @@ release + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + + org.apache.maven.plugins maven-gpg-plugin @@ -378,11 +387,4 @@ - - - - ossrh-awspring - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - diff --git a/spring-cloud-aws-samples/pom.xml b/spring-cloud-aws-samples/pom.xml index 0a791fecc..8ba5d14a8 100644 --- a/spring-cloud-aws-samples/pom.xml +++ b/spring-cloud-aws-samples/pom.xml @@ -49,6 +49,14 @@ true + + org.sonatype.central + central-publishing-maven-plugin + true + + true + +