From 02d687582468dfe146828632c495ca6b8ff583ed Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 13 Jul 2025 06:27:31 -0400 Subject: [PATCH] build: utilize central publishing --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/release.yml | 14 +++++++------- pom.xml | 26 +++++++++----------------- settings.xml | 10 ++++------ 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9847615dd6..65129e10e60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Install gpg secret key id: install-gpg-key run: | - cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import + cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import gpg --list-secret-keys --keyid-format LONG - uses: actions/checkout@v4 - name: Check Maven Cache @@ -52,19 +52,19 @@ jobs: with: java-version: 11 distribution: 'zulu' - server-id: ossrh - server-username: ${{ secrets.OSSRH_USERNAME }} - server-password: ${{ secrets.OSSRH_TOKEN }} + server-id: central + server-username: ${{ secrets.CENTRAL_USER }} + server-password: ${{ secrets.CENTRAL_PASSWORD }} - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0 with: version: 6.0.2 - name: Build Snapshot with Maven id: build-snapshot env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USER }} + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - run: mvn -V -s settings.xml -Prelease clean package verify source:jar javadoc:jar gpg:sign deploy -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + run: mvn -V -s settings.xml -Prelease clean package verify source:jar javadoc:jar gpg:sign deploy -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PRIVATE_KEY_PASSWORD }} - name: SARIF Multitool uses: microsoft/sarif-actions@v0.1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 081eb1e67ad..5e4ad160d1d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - name: Install gpg secret key id: install-gpg-key run: | - cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import + cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import gpg --list-secret-keys --keyid-format LONG - uses: actions/checkout@v4 - name: Check Maven Cache @@ -54,9 +54,9 @@ jobs: with: java-version: 11 distribution: 'zulu' - server-id: ossrh - server-username: ${{ secrets.OSSRH_USERNAME }} - server-password: ${{ secrets.OSSRH_TOKEN }} + server-id: central + server-username: ${{ secrets.CENTRAL_USER }} + server-password: ${{ secrets.CENTRAL_PASSWORD }} - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0 with: version: 6.0.2 @@ -72,11 +72,11 @@ jobs: id: build-release timeout-minutes: 120 env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USER }} + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} NVD_API_KEY: ${{ secrets.NVD_API_KEY }} run: | - mvn -V -s settings.xml -Prelease "-DnexusUrl=https://oss.sonatype.org/" clean package source:jar javadoc:jar gpg:sign deploy site site:stage -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + mvn -V -s settings.xml -Prelease clean package source:jar javadoc:jar gpg:sign deploy site site:stage -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PRIVATE_KEY_PASSWORD }} - name: Archive code coverage results id: archive-coverage uses: actions/upload-artifact@v4 diff --git a/pom.xml b/pom.xml index b0c13dfa2ba..75417181450 100644 --- a/pom.xml +++ b/pom.xml @@ -177,14 +177,6 @@ Copyright (c) 2012 - Jeremy Long 5.15.0 - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - gh-pages gh-pages @@ -271,9 +263,9 @@ Copyright (c) 2012 - Jeremy Long 3.1.1 - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 org.apache.maven.plugins @@ -730,14 +722,14 @@ Copyright (c) 2012 - Jeremy Long - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 true - ossrh - https://oss.sonatype.org/ - true - 120 + central + true + published diff --git a/settings.xml b/settings.xml index 2b4e4a8a752..1c149a8bf7f 100644 --- a/settings.xml +++ b/settings.xml @@ -4,17 +4,15 @@ https://maven.apache.org/xsd/settings-1.0.0.xsd"> - ossrh - ${env.MAVEN_USERNAME} - ${env.MAVEN_PASSWORD} + central + ${env.CENTRAL_USER} + ${env.CENTRAL_PASSWORD} default - - - +