diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index f5194c2..1eda5f1 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -5,7 +5,7 @@ SERVICE_NAME=$1 if [[ "$bamboo_planRepository_branchName" == "master" ]] then - branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') + branchVersion=$(cat pom.xml | grep -Eo " .*-SNAPSHOT" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|' | tr -d ' ') latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 ) newVersion="$(semver $latestVersion -p -i minor)" elif [[ "$bamboo_planRepository_branchName" == release* ]] @@ -30,11 +30,13 @@ echo "gitTag=${newVersion}" > git.tag mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ + ${bamboo_maven_add_param} \ versions:set \ -DnewVersion=${newVersion} mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ + ${bamboo_maven_add_param} \ versions:set \ -DnewVersion=${newVersion}