Try to manage 'snapshot' versions ourselves, to avoid bom-pom causing floating versions to be included...

.circleci/adjust-pom-version.sh

@@ -1,23 +1,34 @@
 #!/bin/bash
 
-if [ -z "$CIRCLE_BRANCH" ] && [ -z "$CIRCLE_TAG" ]; then
+## todo - some version of:
-   echo "Error:  env vars CIRCLE_BRANCH and CIRCLE_TAG were not set."
+## - main (or -version tag?) noop?
-   exit 1;
+## - dev ... replace -SNAPSHOT w/ -${timestamp}
-fi
+## - other tags ... replace -SNAPSHOT w/ -${tag}-${timestamp}
 
-if [ "$CIRCLE_BRANCH" == "dev" ] || [ "$CIRCLE_BRANCH" == "staging" ] || [ "$CIRCLE_BRANCH" == "main" ] || [ \! -z $(echo "$CIRCLE_TAG" | grep "^version-") ]; then
+POM=$(dirname $0)/../pom.xml
-   echo "On a primary branch or tag [${CIRCLE_BRANCH}${CIRCLE_TAG}] - will not edit the pom version.";
+echo "On branch: $CIRCLE_BRANCH, tag: $CIRCLE_TAG..."
+
+REVISION=$(grep '<revision>' $POM | sed 's/.*<revision>//;s/<.*//');
+echo "<revision> in pom.xml is: $REVISION"
+if [ \! $(echo "$REVISION" | grep SNAPSHOT) ]; then
+   echo "Not on a SNAPSHOT revision, so nothing to do here."
    exit 0;
 fi
 
-if [ -n "$CIRCLE_BRANCH" ]; then
+SLUG=""
-   SLUG=$(echo $CIRCLE_BRANCH | sed 's/[^a-zA-Z0-9]/-/g')
+if [ $(echo "$CIRCLE_TAG" | grep ^snapshot-) ]; then
-else
+   SLUG=$(echo "$CIRCLE_TAG" | sed "s/^snapshot-//")-
-   SLUG=$(echo $CIRCLE_TAG | sed 's/^snapshot-//g')
+   echo "Using slug [$SLUG] from tag [$CIRCLE_TAG]"
+
+elif [ $(echo "$CIRCLE_BRANCH" |  grep ^integration/) ]; then
+   SLUG=$(echo "$CIRCLE_BRANCH" | sed "s,/,-,g")-
+   echo "Using slug [$SLUG] from branch [$CIRCLE_BRANCH]"
 fi
 
-POM=$(dirname $0)/../pom.xml
+TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+REPLACEMENT=${SLUG}${TIMESTAMP}
 
-echo "Updating $POM <revision> to: $SLUG-SNAPSHOT"
+echo "Updating $POM -SNAPSHOT to: -$REPLACEMENT"
-sed -i "s/<revision>.*/<revision>$SLUG-SNAPSHOT<\/revision>/" $POM
+sed -i "s/-SNAPSHOT<\/revision>/-$REPLACEMENT<\/revision>/" $POM
 git diff $POM
+

.circleci/config.yml

@@ -92,7 +92,7 @@ commands:
       - run:
           name: Run Maven Jar Deploy
           command: |
-            mvn -s .circleci/mvn-settings.xml -T4 flatten:flatten jar:jar deploy:deploy
+            mvn -s .circleci/mvn-settings.xml -T4 flatten:flatten jar:jar deploy:deploy -DuniqueVersion=false
       - save_cache:
           paths:
             - ~/.m2