From eef71c6272832a211a14df629077111b38ce963d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gonz=C3=A1lez=20Marcos?= Date: Thu, 10 Jul 2025 13:18:23 +0200 Subject: [PATCH 1/5] chore: remove node_modules --- node_modules/.pnpm-workspace-state.json | 25 ------------------------- node_modules/.pnpm/lock.yaml | 16 ---------------- node_modules/pricing4ts | 1 - 3 files changed, 42 deletions(-) delete mode 100644 node_modules/.pnpm-workspace-state.json delete mode 100644 node_modules/.pnpm/lock.yaml delete mode 120000 node_modules/pricing4ts diff --git a/node_modules/.pnpm-workspace-state.json b/node_modules/.pnpm-workspace-state.json deleted file mode 100644 index f416e62..0000000 --- a/node_modules/.pnpm-workspace-state.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "lastValidatedTimestamp": 1750960559706, - "projects": {}, - "pnpmfileExists": false, - "settings": { - "autoInstallPeers": true, - "dedupeDirectDeps": false, - "dedupeInjectedDeps": true, - "dedupePeerDependents": true, - "dev": true, - "excludeLinksFromLockfile": false, - "hoistPattern": [ - "*" - ], - "hoistWorkspacePackages": true, - "injectWorkspacePackages": false, - "linkWorkspacePackages": false, - "nodeLinker": "isolated", - "optional": true, - "preferWorkspacePackages": false, - "production": true, - "publicHoistPattern": [] - }, - "filteredInstall": false -} diff --git a/node_modules/.pnpm/lock.yaml b/node_modules/.pnpm/lock.yaml deleted file mode 100644 index c65e7f9..0000000 --- a/node_modules/.pnpm/lock.yaml +++ /dev/null @@ -1,16 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -overrides: - pricing4ts: link:../../../../../Library/pnpm/global/5/node_modules/pricing4ts - -importers: - - .: - dependencies: - pricing4ts: - specifier: link:../../../../../Library/pnpm/global/5/node_modules/pricing4ts - version: link:../../../../../Library/pnpm/global/5/node_modules/pricing4ts diff --git a/node_modules/pricing4ts b/node_modules/pricing4ts deleted file mode 120000 index c9df06c..0000000 --- a/node_modules/pricing4ts +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Library/pnpm/global/5/node_modules/pricing4ts \ No newline at end of file From 73d598c39b6d3d06de2177e6fbdaad5aec089202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gonz=C3=A1lez=20Marcos?= Date: Thu, 10 Jul 2025 13:23:09 +0200 Subject: [PATCH 2/5] build: replace deploy plugin --- pom.xml | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 74138a7..561c172 100644 --- a/pom.xml +++ b/pom.xml @@ -37,17 +37,6 @@ https://github.com/Alex-GF/pricingplans-4j/tree/main - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - 2.14.2 1.9.7 @@ -177,8 +166,16 @@ Pricing4Java - - + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + central + true + + org.apache.maven.plugins maven-gpg-plugin @@ -199,24 +196,7 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://s01.oss.sonatype.org/ - true - - - - com.thoughtworks.xstream - xstream - 1.4.15 - - - + maven-surefire-plugin 3.5.2 From ecf6f666073c20d269c28933475683b8c061e3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gonz=C3=A1lez=20Marcos?= Date: Thu, 10 Jul 2025 13:30:31 +0200 Subject: [PATCH 3/5] feat: simplify Github Actions --- .github/workflows/deploy-release.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index a1398b3..fc1f7ed 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -1,7 +1,7 @@ name: Publish package to the Maven Central Repository on: - release: - types: [created] + release: + types: [created] jobs: publish: runs-on: ubuntu-latest @@ -12,22 +12,14 @@ jobs: with: java-version: "17" distribution: "temurin" - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - - name: Install gpg secret key - run: | - # Install gpg secret key - echo "${{ secrets.OSSRH_GPG_SECRET_KEY }}" | base64 --decode | gpg --batch --import - # Verify that the key ID is shown in the logs - gpg --list-secret-keys --keyid-format LONG | grep "${{ secrets.OSSRH_GPG_SECRET_KEY_ID }}" + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Central Repository env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - run: | - mvn \ - --no-transfer-progress \ - --batch-mode \ - -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \ - clean deploy + MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + run: mvn --batch-mode deploy From fb94daa0edb2ba86fabc38f273bd3968d068dcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gonz=C3=A1lez=20Marcos?= Date: Thu, 10 Jul 2025 13:32:45 +0200 Subject: [PATCH 4/5] pom: remove not necessary gpg-sign parameters --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 561c172..8dfd887 100644 --- a/pom.xml +++ b/pom.xml @@ -188,10 +188,6 @@ sign - - --pinentry-mode - loopback - From 8859f9889da0d15bab4c76b8724151b5bc4f117d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gonz=C3=A1lez=20Marcos?= Date: Thu, 10 Jul 2025 16:53:12 +0200 Subject: [PATCH 5/5] feat: try OSSRH_GPG_SECRET_KEY --- .github/workflows/deploy-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index fc1f7ed..b7b160f 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -15,7 +15,7 @@ jobs: server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Central Repository env: