From 42522a188f09e6abf04ad17ba088b80094db83b8 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Thu, 4 Jun 2026 10:22:41 -0400
Subject: [PATCH] fix and rename version script

---
 version.sh => autoversion.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
 rename version.sh => autoversion.sh (70%)
 mode change 100755 => 100644

diff --git a/version.sh b/autoversion.sh
old mode 100755
new mode 100644
similarity index 70%
rename from version.sh
rename to autoversion.sh
index 331bb9c..5a527f2
--- a/version.sh
+++ b/autoversion.sh
@@ -5,17 +5,18 @@ CURRENT_FULL_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=project.ve
 echo "Detected the current version: ${CURRENT_FULL_VERSION}"
 CURRENT_MINOR_VERSION=`echo "${CURRENT_FULL_VERSION}" | sed 's~^\([^\.]\+\.[^\.\-]\+\).*~\1~'`
 echo "Computed the current minor version: ${CURRENT_MINOR_VERSION}"
-set +e
-LATEST_SERVICE_VERSION=`git ls-remote --tags --refs --sort=-v:refname origin v${CURRENT_MINOR_VERSION}* | grep refs/tags | head -n1 | sed "s~.\+refs/tags/v${CURRENT_MINOR_VERSION}\.\(.\+\)~\1~"`
-set -e
-echo "Detected the latest service version in Git for the minor version: ${CURRENT_MINOR_VERSION} => ${LATEST_SERVICE_VERSION}"
-if [[ -z ${LATEST_SERVICE_VERSION} ]]; then
-	LATEST_SERVICE_VERSION=-1
-fi
-NEXT_FULL_VERSION="${CURRENT_MINOR_VERSION}.$((LATEST_SERVICE_VERSION + 1))"
-echo "Computed the next version: ${NEXT_FULL_VERSION}"
 
 CURRENT_APS_MAJOR_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=aps.majorVersion`
 echo "Detected the current APS major version: ${CURRENT_APS_MAJOR_VERSION}"
 
-mvn versions:set -DnewVersion=${NEXT_FULL_VERSION}-aps-v${CURRENT_APS_MAJOR_VERSION}
+set +e
+LATEST_SERVICE_VERSION=`git ls-remote --tags --refs --sort=-v:refname origin v${CURRENT_MINOR_VERSION}*-aps-v${CURRENT_APS_MAJOR_VERSION} | grep refs/tags | head -n1 | sed "s~.\+refs/tags/v${CURRENT_MINOR_VERSION}\.\([^\.\-]\+\).*~\1~"`
+set -e
+echo "Detected the latest service version in Git for the minor version: ${CURRENT_MINOR_VERSION}.#-aps-v${CURRENT_APS_MAJOR_VERSION} => ${LATEST_SERVICE_VERSION}"
+if [[ -z ${LATEST_SERVICE_VERSION} ]]; then
+	LATEST_SERVICE_VERSION=-1
+fi
+NEXT_FULL_VERSION="${CURRENT_MINOR_VERSION}.$((LATEST_SERVICE_VERSION + 1))-aps-v${CURRENT_APS_MAJOR_VERSION}"
+echo "Computed the next version: ${NEXT_FULL_VERSION}"
+
+mvn versions:set -DnewVersion=${NEXT_FULL_VERSION}