diff --git a/.github/workflows/release.actions.yml b/.github/workflows/release.actions.yml index 7b2898d5d..442dcc59a 100644 --- a/.github/workflows/release.actions.yml +++ b/.github/workflows/release.actions.yml @@ -29,7 +29,7 @@ jobs: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: temurin @@ -45,9 +45,17 @@ jobs: git config --local user.name "GitHub Action" - name: Maven release ${{steps.metadata.outputs.current-version}} + id: maven_release run: | - mvn -B release:prepare -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -Prelease + current_version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) + release_version=${current_version%-SNAPSHOT} + echo "Next release version is: $release_version" + next_dev_version="$(( ${current_version} + 1 ))-SNAPSHOT" + echo "Next development version is: $next_dev_version" + mvn -B release:prepare -DreleaseVersion=${current_version} -DdevelopmentVersion=${next_dev_version} -Prelease mvn -B release:perform -Darguments=-Dlib -Prelease + echo "::set-output name=release_version::$release_version" + echo "::set-output name=next_dev_version::$next_dev_version" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} @@ -56,7 +64,7 @@ jobs: uses: jreleaser/release-action@v2 env: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - JRELEASER_PROJECT_VERSION: ${{ steps.metadata.outputs.current-version }} + JRELEASER_PROJECT_VERSION: ${{ steps.maven_release.outputs.release_version }} with: setup-java: false diff --git a/acceptance-test/pom.xml b/acceptance-test/pom.xml index 80cf43a6d..a56043f46 100644 --- a/acceptance-test/pom.xml +++ b/acceptance-test/pom.xml @@ -6,7 +6,7 @@ io.quarkus.code code-quarkus-parent - 1.0.0-SNAPSHOT + 1-SNAPSHOT 17 diff --git a/base/.locker/pom.xml b/base/.locker/pom.xml index 5c26a128a..263ad2245 100644 --- a/base/.locker/pom.xml +++ b/base/.locker/pom.xml @@ -7,7 +7,7 @@ io.quarkus.code code-quarkus-base-locker - 1.0.0-SNAPSHOT + 1-SNAPSHOT pom diff --git a/base/pom.xml b/base/pom.xml index a731fbdd5..88cd2251b 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -6,7 +6,7 @@ io.quarkus.code code-quarkus-parent - 1.0.0-SNAPSHOT + 1-SNAPSHOT true diff --git a/community-app/pom.xml b/community-app/pom.xml index b3cf68911..9c0d49fa9 100644 --- a/community-app/pom.xml +++ b/community-app/pom.xml @@ -6,7 +6,7 @@ io.quarkus.code code-quarkus-parent - 1.0.0-SNAPSHOT + 1-SNAPSHOT code-quarkus-community-app diff --git a/pom.xml b/pom.xml index c8b244b7b..d922f0845 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.quarkus.code code-quarkus-parent - 1.0.0-SNAPSHOT + 1-SNAPSHOT pom 3.11.0