From 6cdda3e6469029b61074aa953bc48197f71f36cf Mon Sep 17 00:00:00 2001 From: redcatbaer Date: Sat, 24 May 2025 11:20:05 +0200 Subject: [PATCH 1/4] #452: Changed release workflow to central repo. --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11b551c3..6e5e6d4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,10 +51,10 @@ jobs: - name: Publish to Maven Central Repository if: ${{ !inputs.skip-deploy-maven-central }} - run: mvn --batch-mode deploy -Possrh -DstagingDescription="Deployed via GitHub workflow release.yml" + run: mvn --batch-mode deploy -Pcentral-publishing -DdeploymentName="Deployed via GitHub workflow release.yml" env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} - name: Create GitHub Release From 78c0da71e1c35ffce55d2e6abcdbd10287917099 Mon Sep 17 00:00:00 2001 From: redcatbaer Date: Sat, 24 May 2025 11:47:26 +0200 Subject: [PATCH 2/4] #452: Updated dependencies and changelog. --- doc/changes/changes_4.2.0.md | 8 ++++++++ parent/pom.xml | 34 ++++++++++++---------------------- testutil/pom.xml | 6 +++--- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/doc/changes/changes_4.2.0.md b/doc/changes/changes_4.2.0.md index ba15761f..8fb07be1 100644 --- a/doc/changes/changes_4.2.0.md +++ b/doc/changes/changes_4.2.0.md @@ -10,6 +10,10 @@ We also added a whole section about understanding and fixing broken links betwee The new token `oft:on|off` allows switching off OFT parsing for certain text passages in Markdown and RST documents. +The Central Repository changed its deployment mechanism. We adapted the project accordingly. + +Finally, we updated test dependencies and Maven plugins. + ## Features * #437: Upgrade build and test dependencies on top of 4.1.0 @@ -22,3 +26,7 @@ The new token `oft:on|off` allows switching off OFT parsing for certain text pas * #449: Fix parsing past end of "needs" paragraph. * #440: Added Tag importer support for TOML files. * #442: Added support for javascript file extensions `.cjs`, `.mjs` and `.ejs` + +## Refactoring + +#452: Migrated Deployment to new Central Repository mechanism diff --git a/parent/pom.xml b/parent/pom.xml index f1b712d0..439a34de 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ 4.1.0 17 - 5.11.4 + 5.12.2 3.5.2 UTF-8 UTF-8 @@ -48,16 +48,6 @@ scm:git:https://github.com/itsallcode/openfasttrace.git https://github.com/itsallcode/openfasttrace - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - org.junit.jupiter @@ -219,7 +209,7 @@ org.mockito mockito-junit-jupiter - 5.15.2 + 5.18.0 test @@ -237,7 +227,7 @@ nl.jqno.equalsverifier equalsverifier - 3.18.1 + 4.0 test @@ -250,12 +240,12 @@ - ossrh + central-publishing - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin org.apache.maven.plugins @@ -666,14 +656,14 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://oss.sonatype.org/ - true + central + true + validated diff --git a/testutil/pom.xml b/testutil/pom.xml index b98572f3..16681548 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -80,10 +80,10 @@ - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin - true + true From 8a47c23263680a6f5fc39dd88095f8a5a777b9ae Mon Sep 17 00:00:00 2001 From: redcatbaer Date: Sat, 24 May 2025 11:48:39 +0200 Subject: [PATCH 3/4] #452: Updated release date. --- doc/changes/changes_4.2.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changes/changes_4.2.0.md b/doc/changes/changes_4.2.0.md index 8fb07be1..e9459b44 100644 --- a/doc/changes/changes_4.2.0.md +++ b/doc/changes/changes_4.2.0.md @@ -1,4 +1,4 @@ -# OpenFastTrace 4.2.0, released 2025-05-19 +# OpenFastTrace 4.2.0, released 2025-05-23 Code name: Markdown code blocks From 987eadd500c77276e8e9c84273b0263b2743079a Mon Sep 17 00:00:00 2001 From: Christoph Pirkl <4711730+kaklakariada@users.noreply.github.com> Date: Sat, 24 May 2025 16:46:19 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- .github/workflows/release.yml | 2 +- doc/changes/changes_4.2.0.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e5e6d4a..10b0ba04 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: - name: Publish to Maven Central Repository if: ${{ !inputs.skip-deploy-maven-central }} - run: mvn --batch-mode deploy -Pcentral-publishing -DdeploymentName="Deployed via GitHub workflow release.yml" + run: mvn --batch-mode deploy -Pcentral-publishing -DdeploymentName="Deployed OFT via GitHub workflow release.yml" env: MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_PORTAL_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PORTAL_TOKEN }} diff --git a/doc/changes/changes_4.2.0.md b/doc/changes/changes_4.2.0.md index e9459b44..b617ab66 100644 --- a/doc/changes/changes_4.2.0.md +++ b/doc/changes/changes_4.2.0.md @@ -1,4 +1,4 @@ -# OpenFastTrace 4.2.0, released 2025-05-23 +# OpenFastTrace 4.2.0, released 2025-05-24 Code name: Markdown code blocks