From 9659e5b9eadcf1b7e2f2f8dee096112cf8dbc2da Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Thu, 16 Feb 2023 13:15:03 -0600 Subject: [PATCH] updated snapshot version, fixed parsing of pom.xml when determining version number --- qqq-dev-tools/CURRENT-SNAPSHOT-VERSION | 2 +- qqq-dev-tools/bin/end-of-sprint-release.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qqq-dev-tools/CURRENT-SNAPSHOT-VERSION b/qqq-dev-tools/CURRENT-SNAPSHOT-VERSION index 48262dc9..54d1a4f2 100644 --- a/qqq-dev-tools/CURRENT-SNAPSHOT-VERSION +++ b/qqq-dev-tools/CURRENT-SNAPSHOT-VERSION @@ -1 +1 @@ -0.13.0 +0.13.0 diff --git a/qqq-dev-tools/bin/end-of-sprint-release.sh b/qqq-dev-tools/bin/end-of-sprint-release.sh index a719800a..423165a9 100755 --- a/qqq-dev-tools/bin/end-of-sprint-release.sh +++ b/qqq-dev-tools/bin/end-of-sprint-release.sh @@ -24,7 +24,7 @@ function gumConfirmProceed } QQQ_RELEASE_DIR=/tmp/qqq-release -QQQ_DEV_TOOLS_DIR=${}QQQ_RELEASE_DIR}/qqq/qqq-dev-tools +QQQ_DEV_TOOLS_DIR=${QQQ_RELEASE_DIR}/qqq/qqq-dev-tools mkdir -p $QQQ_RELEASE_DIR/qqq cd $QQQ_RELEASE_DIR/qqq || exit @@ -78,7 +78,7 @@ gumBanner "Running mvn gitflow:release-finish" mvn gitflow:release-finish gumBanner "Updating qqq-dev-tools/CURRENT-SNAPSHOT-VERSION" -CURRENT_SNAPSHOT_VERSION=$(grep '' pom.xml | sed 's/<.\?revision>//g;s/-SNAPSHOT//;s/ //g;') +CURRENT_SNAPSHOT_VERSION=$(grep '' pom.xml | sed 's/[ \t]*//; s/-SNAPSHOT//g; s/<[^>]*>//g') echo $CURRENT_SNAPSHOT_VERSION > $QQQ_DEV_TOOLS_DIR/CURRENT-SNAPSHOT-VERSION cd $QQQ_DEV_TOOLS_DIR || exit git commit -m "Updating to $CURRENT_SNAPSHOT_VERSION" CURRENT-SNAPSHOT-VERSION