Merge branch 'main' into develop

.github/workflows/assert-project-version.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+pomFile=$1
+expectedVersion=$2
+
+projectVersion=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout --file ${pomFile})
+if [[ $projectVersion == "${expectedVersion}" ]]; then
+    echo "Version is correct: '${expectedVersion}'"
+else
+    echo "Bad version! Expected '${expectedVersion}' but was '$projectVersion'"
+    exit 1
+fi

.github/workflows/test-current-branch.yml

@@ -53,12 +53,7 @@ jobs:
         pom-file: "non-branch-version-pom.xml"
 
     - name: Assert version unchanged
-      run: |
-        projectVersion=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout --file non-branch-version-pom.xml)
-        if [[ $projectVersion != "1.0.0" ]]; then
-            echo "Bad version! Expected '1.0.0' but was '$projectVersion'"
-            exit 1
-        fi
+      run: .github/workflows/assert-project-version.sh non-branch-version-pom.xml 1.0.0
 
     - name: Assert dependency version unchanged
       run: .github/workflows/assert-dependency-version.sh non-branch-version-pom.xml com.jardoapps.maven-flow dummy-dependency 1.0.0
@@ -75,12 +70,7 @@ jobs:
         pom-file: "branch-version-pom.xml"
 
     - name: Assert version changed
-      run: |
-        projectVersion=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout --file branch-version-pom.xml)
-        if [[ $projectVersion != "1.0.1-SNAPSHOT" ]]; then
-            echo "Bad version! Expected '1.0.1-SNAPSHOT' but was '$projectVersion'"
-            exit 1
-        fi
+      run: .github/workflows/assert-project-version.sh branch-version-pom.xml 1.0.1-SNAPSHOT
 
     - name: Assert dependency version changed
       run: .github/workflows/assert-dependency-version.sh branch-version-pom.xml com.jardoapps.maven-flow dummy-dependency 1.0.1-SNAPSHOT