diff --git a/build-folder.sh b/build-folder.sh
index 42e951b2..798ad18a 100755
--- a/build-folder.sh
+++ b/build-folder.sh
@@ -50,6 +50,7 @@ if [ -n "$IS_DEPLOY" ]; then
     VERSION=$($SCDIR/mvn-get-version.sh)
   fi
   echo "Project Version:$VERSION"
+  set +e
   IS_SNAPSHOT=$(echo $VERSION | grep -E "^.*-SNAPSHOT$")
   IS_MILESTONE=$(echo $VERSION | grep -E "^.*-(M|RC)[0-9]+$")
   IS_GA=$(echo $VERSION | grep -E "^.*\.[0-9]+$")
@@ -105,7 +106,7 @@ if [ "$SKIP_RESOLVE" = "" ]; then
   SKIP_RESOLVE=true
 fi
 
-if [ "$SKIP_RESOLVE" = "false" ]; then
+if [ "$SKIP_RESOLVE" = "true" ]; then
   RETRIES=-1
   RESULT=0
 else
diff --git a/get-build-version-params.sh b/get-build-version-params.sh
index 12316ad1..8e3393cc 100755
--- a/get-build-version-params.sh
+++ b/get-build-version-params.sh
@@ -6,7 +6,6 @@ if (( sourced == 0 )); then
   echo "This script must be invoked using: source $0 $*"
   exit 1
 fi
-grep --version
 # get the target release version and type
 export BUILD_VERSION=$(cat $SCDIR/version/RELEASE_VERSION)
 echo "BUILD_VERSION: $BUILD_VERSION"
diff --git a/mvn-get-version.sh b/mvn-get-version.sh
index 3f6fa270..fa367ef4 100755
--- a/mvn-get-version.sh
+++ b/mvn-get-version.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
-VERSIONS=$(./mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g' | sed 's/version=//g')
+SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
+SCDIR=$(realpath $SCDIR)
+VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g' | sed 's/version=//g')
 for v in $VERSIONS; do
   VERSION=$v
 done