diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index 02faa3e..3db48a1 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -6,12 +6,12 @@ SERVICE_NAME=$1 if [[ "$bamboo_planRepository_branchName" == "master" ]] then branchVersion=$(cat pom.xml | grep -Eo ".*" | sed -s 's|\(.*\)\..*\(-*.*\)|\1|') - latestVersion=$( semver $(git tag -l "${version}-*" ) | tail -n1 ) + latestVersion=$( semver $(git tag -l "${branchVersion}-*" ) | tail -n1 ) newVersion="$(semver $latestVersion -p -i minor)" elif [[ "$bamboo_planRepository_branchName" == release* ]] then branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|') - latestVersion=$( semver $(git tag -l "${version}-*" ) | tail -n1 ) + latestVersion=$( semver $(git tag -l "${branchVersion}-*" ) | tail -n1 ) newVersion="$(semver $latestVersion -p -i patch)" elif [[ "${bamboo_version_tag}" != "dev" ]] then