diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 1784bb58..c306eeb4 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -76,7 +76,7 @@ jobs: deploy-to-maven-central: needs: check-version - # use environment maven-central, where secrets are configured for OSSRH_* + # use environment maven-central, where secrets are configured for MAVEN_CENTRAL_PORTAL_* environment: name: maven-central url: https://repo.maven.apache.org/maven2/net/sourceforge/pmd/pmd-designer/ @@ -96,15 +96,15 @@ jobs: distribution: 'temurin' java-version: '11' cache: 'maven' - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.PMD_CI_GPG_PRIVATE_KEY }} - name: Build and Publish env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PORTAL_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.PMD_CI_GPG_PASSPHRASE }} run: | ./mvnw --show-version --errors --batch-mode \ diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 82789c40..3f6a5c71 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -67,10 +67,10 @@ jobs: deploy-to-maven-central: needs: check-version - # use environment maven-central, where secrets are configured for OSSRH_* + # use environment maven-central, where secrets are configured for MAVEN_CENTRAL_PORTAL_* environment: name: maven-central - url: https://oss.sonatype.org/content/repositories/snapshots/net/sourceforge/pmd/pmd-designer/ + url: https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/net/sourceforge/pmd/pmd-designer/ runs-on: ubuntu-latest timeout-minutes: 20 defaults: @@ -85,15 +85,15 @@ jobs: distribution: 'temurin' java-version: '11' cache: 'maven' - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.PMD_CI_GPG_PRIVATE_KEY }} - name: Build and Publish env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PORTAL_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.PMD_CI_GPG_PASSPHRASE }} run: | ./mvnw --show-version --errors --batch-mode \ diff --git a/pom.xml b/pom.xml index 4ed096d0..a7751f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,16 +25,6 @@ https://github.com/pmd/pmd-designer/actions - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - oowekyala @@ -122,6 +112,11 @@ maven-shade-plugin 3.6.0 + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 + @@ -393,16 +388,14 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin true - ossrh - https://oss.sonatype.org/ - - true + central + true + published + ${project.artifactId} @@ -505,31 +498,7 @@ local-libs file://${local.lib.repo} - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - - sonatype-nexus-plugin-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - @@ -1043,6 +1012,35 @@ + + central-portal-snapshots + + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + + + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + +