From 043496e032f025102700fa4aa82f738677364a7d Mon Sep 17 00:00:00 2001 From: jameswang-us Date: Wed, 22 Oct 2025 17:01:44 -0500 Subject: [PATCH 1/3] Change workflows to publish to central portal --- .github/workflows/maven-ci.yml | 12 ++++++------ .github/workflows/maven-publish.yml | 13 +++++++------ pom.xml | 16 +++++++--------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 6f86f1c..d08c914 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -43,16 +43,16 @@ jobs: name: Build Java - ${{ matrix.java }} steps: - name: Checkout Source Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Maven Prepare id: maven-prepare uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} -# distribution: 'temurin' + distribution: 'temurin' server-id: ossrh - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.SONATYPE_GPG_PRIVATE_KEY }} gpg-passphrase: SONATYPE_GPG_PASSPHRASE - name: Build Maven Project @@ -62,8 +62,8 @@ jobs: if: success() && (github.event_name == 'push' && matrix.java == env.PRIMARY_JAVA_VERSION) run: ./mvnw --batch-mode deploy -D ci.deploy env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} SONATYPE_GPG_PASSPHRASE: ${{ secrets.SONATYPE_GPG_PASSPHRASE }} - name: Publish Test Report if: always() diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index b5c9c73..67651e5 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -8,15 +8,16 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout Source Code + uses: actions/checkout@v4 - name: Set up Maven Central Repository uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' - server-id: ossrh - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD + server-id: central + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.SONATYPE_GPG_PRIVATE_KEY }} gpg-passphrase: SONATYPE_GPG_PASSPHRASE - name: Set version @@ -24,6 +25,6 @@ jobs: - name: Publish package run: ./mvnw --batch-mode deploy -D ci.deploy env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} SONATYPE_GPG_PASSPHRASE: ${{ secrets.SONATYPE_GPG_PASSPHRASE }} diff --git a/pom.xml b/pom.xml index 538da7f..08d5b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -151,15 +151,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 true - ossrh - https://oss.sonatype.org/ - true - d56a306692c92 + central + true @@ -392,8 +390,8 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin From 993570d5823157d0de5b0c5ec2da2794d5130400 Mon Sep 17 00:00:00 2001 From: jameswang-us Date: Thu, 23 Oct 2025 10:10:04 -0500 Subject: [PATCH 2/3] Clean up and test ci workflow --- .github/workflows/maven-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index d08c914..8b8084f 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -5,6 +5,7 @@ on: branches: - 'main' - 'releases/[1-9]+.[0-9]+.x' + - 'publish*' paths-ignore: # - '.github/**' - '.gitignore' @@ -19,6 +20,7 @@ on: branches: - 'main' - 'releases/[1-9]+.[0-9]+.x' + - 'publish*' paths-ignore: # - '.github/**' - '.gitignore' @@ -46,11 +48,11 @@ jobs: uses: actions/checkout@v4 - name: Maven Prepare id: maven-prepare - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' - server-id: ossrh + server-id: central server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.SONATYPE_GPG_PRIVATE_KEY }} @@ -58,7 +60,7 @@ jobs: - name: Build Maven Project if: success() && (github.event_name == 'pull_request' || (github.event_name == 'push' && matrix.java != env.PRIMARY_JAVA_VERSION)) run: ./mvnw --batch-mode install -D ci.build - - name: Build Maven Project and Deploy to Sonatype OSSRH + - name: Build Maven Project and Deploy to Maven Central Repository if: success() && (github.event_name == 'push' && matrix.java == env.PRIMARY_JAVA_VERSION) run: ./mvnw --batch-mode deploy -D ci.deploy env: From 168312ee7bca627b84972e284708266f030b0dce Mon Sep 17 00:00:00 2001 From: jameswang-us Date: Thu, 23 Oct 2025 11:34:54 -0500 Subject: [PATCH 3/3] Clean up pom --- .github/workflows/maven-publish.yml | 2 +- pom.xml | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 67651e5..8378c22 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -22,7 +22,7 @@ jobs: gpg-passphrase: SONATYPE_GPG_PASSPHRASE - name: Set version run: ./mvnw versions:set -DnewVersion=${{ github.event.release.tag_name }} - - name: Publish package + - name: Publish package to Maven Central Repository run: ./mvnw --batch-mode deploy -D ci.deploy env: MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} diff --git a/pom.xml b/pom.xml index 08d5b1e..2c4af96 100644 --- a/pom.xml +++ b/pom.xml @@ -68,9 +68,6 @@ 2.4.21-01 2.9.2-01 - - ossrh - @@ -301,7 +298,6 @@ process-resources - ${flatten.mode} ${project.build.directory} @@ -374,16 +370,6 @@ ci.deploy - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2 - -