Fix release (#1258)

quarkusio · Jan 3, 2024 · 72da1b5 · 72da1b5
1 parent 9d3a11b
commit 72da1b5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.quarkus.code</groupId>
     <artifactId>code-quarkus-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.compiler.release>17</maven.compiler.release>

diff --git a/base/.locker/pom.xml b/base/.locker/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>io.quarkus.code</groupId>
   <artifactId>code-quarkus-base-locker</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <dependencyManagement>
     <dependencies>

diff --git a/base/pom.xml b/base/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.quarkus.code</groupId>
     <artifactId>code-quarkus-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.compiler.parameters>true</maven.compiler.parameters>

diff --git a/community-app/pom.xml b/community-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.quarkus.code</groupId>
         <artifactId>code-quarkus-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1-SNAPSHOT</version>
     </parent>
 
     <artifactId>code-quarkus-community-app</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.quarkus.code</groupId>
     <artifactId>code-quarkus-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>