diff --git a/Jenkinsfile b/Jenkinsfile index 4ffce00..d043ded 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -166,11 +166,12 @@ def SetVersion( v ) { version = branch_name_base + "." + build_number + "-RELEASE"; //version = branch_name.substring('release/'.length()) + "." + build_number currentBuild.displayName = version - } - else { + } else if (v == 'develop') { + version = branch_name_base + "." + build_number + "-SNAPSHOT"; + currentBuild.displayName = version + } else { // for all other branches the version number is 0 with an appended build number // and for the display name use the jenkins default #n and add the branch name - // #900 - develop // #101 - feature/user/foo //version = '0.' + build_number version = branch_name_base + "." + build_number