diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9ce90e..e9bec28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,10 +30,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 11 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 003f622..c2ae04d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,21 +34,16 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} cache: maven - server-id: central - server-username: MAVEN_USERNAME - server-password: MAVEN_CENTRAL_TOKEN - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Set release version id: version @@ -73,27 +68,28 @@ jobs: echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV echo "PLAIN_VERSION=$PLAIN_VERSION" >> $GITHUB_ENV - - name: Release to Maven Central - env: - MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + - name: Stage run: | export GPG_TTY=$(tty) ./mvnw -ntp -B --file pom.xml \ -Drepository.url=https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git \ - -Dmaven.site.skip=true -Ppublication,stage + -Dmaven.site.skip=true -Drelease=true -Ppublication,stage - - name: Release to GitHub + - name: Release env: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} JRELEASER_BRANCH: ${{ env.BRANCH }} + JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} run: | ./mvnw -ntp -B --file pom.xml -pl :moditect-parent -Pjreleaser jreleaser:release - name: JReleaser output if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: jreleaser-release path: | diff --git a/parent/pom.xml b/parent/pom.xml index fb139f0..f9a4f8d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ org.jreleaser jreleaser-maven-plugin - 1.8.0 + ${version.jreleaser.plugin} false true @@ -212,7 +212,7 @@ https://oss.sonatype.org/content/repositories/snapshots/ true true - target/staging-deploy + ${maven.multiModuleProjectDirectory}/target/staging-deploy @@ -227,56 +227,13 @@ ALWAYS - - {{commitShortHash}} {{commitTitle}} + ALWAYS + conventional-commits + true - - {{contributorName}} + - {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}} - - - - Bump - - - - regex:.*#[0-9].* - - - - Merge pull - - - - Merge branch - - - - Preparing - - - - Releasing - - - - - Merge - merge_pull,merge_branch - - - ✅ Issues - issue - - - 🧰 Tasks - task_prep,task_rel - - - ⚙️ Dependencies - dependencies - - - Merge GitHub,dependabot