From 502cd657a3112775223499b0bc89959cbd9afe1a Mon Sep 17 00:00:00 2001 From: csowada Date: Wed, 22 Oct 2025 23:53:39 +0200 Subject: [PATCH 1/9] fix nexus-staging-maven-plugin isse? --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c57e59..adedb8a 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.14 true ossrh From 86c358356cdc5c59536a7cc561f9e9c0ce86f266 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 19:16:10 +0200 Subject: [PATCH 2/9] fix --- pom.xml | 17 ++++++++++++++--- settings.xml | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 settings.xml diff --git a/pom.xml b/pom.xml index adedb8a..86f774a 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ - + + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + false + all + - + diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000..c295de4 --- /dev/null +++ b/settings.xml @@ -0,0 +1,16 @@ + + + + + central + + + central + eNDKoP + wjQOb9oByvoVsUlnzJnnaWr2yTU81Z8KI + + + + + \ No newline at end of file From 8fc3ceae976602c93c51d59364179b5e3247a5e5 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 19:16:59 +0200 Subject: [PATCH 3/9] update --- .github/workflows/maven-publish.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index b9494d1..e74f5ab 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -39,9 +39,9 @@ jobs: java-version: 11 distribution: temurin cache: maven - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - server-username: OSSRH_USERNAME # env variable for username in deploy - server-password: OSSRH_PASSWORD # env variable for token in deploy + server-id: central # Value of the distributionManagement/repository/id field of the pom.xml + server-username: MAVEN_CENTRAL_USER # env variable for username in deploy + server-password: MAVEN_CENTRAL_PASSWORD # env variable for token in deploy gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Build and Verify with Maven @@ -51,8 +51,8 @@ jobs: # run: mvn deploy --batch-mode --update-snapshots -P sign,!build-extras -Dmaven.test.skip=true run: mvn deploy --batch-mode --update-snapshots -P sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true env: - OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }} + # OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }} + # OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Set up Java for publishing to GitHub Packages @@ -62,6 +62,7 @@ jobs: distribution: temurin cache: maven + - name: Publish to GitHub Packages # -DaltDeploymentRepository=github::default::https://maven.pkg.github.com/csowada/ebus run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,!deploy-ossrh,deploy-github -Dmaven.test.skip=true From 312a3b46d2e1cb74945ec75bc8dfd27c922919b8 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 19:26:33 +0200 Subject: [PATCH 4/9] update --- .github/workflows/maven-publish.yml | 5 +++-- BUILD-HELP.md | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index e74f5ab..5b54aa0 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -4,6 +4,7 @@ name: Maven Package on: + workflow_dispatch: push: # Sequence of patterns matched against refs/tags tags: @@ -51,8 +52,8 @@ jobs: # run: mvn deploy --batch-mode --update-snapshots -P sign,!build-extras -Dmaven.test.skip=true run: mvn deploy --batch-mode --update-snapshots -P sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true env: - # OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }} - # OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }} + MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Set up Java for publishing to GitHub Packages diff --git a/BUILD-HELP.md b/BUILD-HELP.md index a56296e..4603121 100644 --- a/BUILD-HELP.md +++ b/BUILD-HELP.md @@ -5,4 +5,8 @@ ```bash # create a new release mvn gitflow:release + + +mvn deploy --batch-mode --update-snapshots -P sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true + ``` \ No newline at end of file From d4a29178152445ab049423bef7fab72b2a742a2d Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 19:50:44 +0200 Subject: [PATCH 5/9] update --- pom.xml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 86f774a..f8d92fd 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ org.apache.felix maven-bundle-plugin - 3.5.1 + 6.0.0 true @@ -175,7 +175,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.8 sign-artifacts @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.1 attach-sources @@ -220,7 +220,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.12.0 none @@ -245,17 +245,6 @@ - org.sonatype.central central-publishing-maven-plugin From a724ba821a132de45ffc50ef92a687ba8f75de00 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 20:07:24 +0200 Subject: [PATCH 6/9] update --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index f8d92fd..f0aaea6 100644 --- a/pom.xml +++ b/pom.xml @@ -259,16 +259,16 @@ - + From acb6b41ea2b66f06aeabcff024a97b7153733c26 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 20:16:00 +0200 Subject: [PATCH 7/9] update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0aaea6..7074a99 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ org.apache.felix maven-bundle-plugin - 6.0.0 + 5.1.9 true From 703079733427067dbb96c87c4b5499380d9f65a4 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 20:23:55 +0200 Subject: [PATCH 8/9] remove dummy credentials, already revoked --- settings.xml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 settings.xml diff --git a/settings.xml b/settings.xml deleted file mode 100644 index c295de4..0000000 --- a/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - central - - - central - eNDKoP - wjQOb9oByvoVsUlnzJnnaWr2yTU81Z8KI - - - - - \ No newline at end of file From 5b21c33d43ffbf8bd6105ca7087d07104725889a Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 23 Oct 2025 20:27:51 +0200 Subject: [PATCH 9/9] fix gpg warning --- .github/workflows/maven-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5b54aa0..44153d1 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -43,7 +43,7 @@ jobs: server-id: central # Value of the distributionManagement/repository/id field of the pom.xml server-username: MAVEN_CENTRAL_USER # env variable for username in deploy server-password: MAVEN_CENTRAL_PASSWORD # env variable for token in deploy - gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Build and Verify with Maven run: mvn --batch-mode --update-snapshots clean compile verify @@ -54,7 +54,7 @@ jobs: env: MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }} MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Set up Java for publishing to GitHub Packages uses: actions/setup-java@v4