Merge pull request 'OZG-5907 update jenkinsfile to upload jars from branches'...

Merge pull request 'OZG-5907 update jenkinsfile to upload jars from branches' (#42) from OZG-5907 into master

Jenkinsfile

@@ -40,6 +40,26 @@ pipeline {
                 }
             }
         }
+        stage('Set Version') {
+          when {
+            not {
+                anyOf {
+                    branch 'master'
+                    branch 'release'
+                }
+            }
+          }
+          steps {
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                    JAR_TAG = getPomVersion().replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
+                }
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
+                    
+                }
+          }
+        }   
 
         stage('Build Administration') {
             steps {
@@ -54,18 +74,13 @@ pipeline {
         }
         
         stage('Deploy to Nexus'){
-            when {
-                anyOf {
-                    branch 'master'
-                    branch 'release'
-                }
-            }
             steps {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
                 }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
+                    sh "mvn -s $MAVEN_SETTINGS versions:revert"
                 }
             }
         }