From b6c71760f79f190fd8e2c65e6e15b92f30967990 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 25 Jul 2018 13:44:23 +0200
Subject: [PATCH] Updated mvn version to include build number

---
 Jenkinsfile | 19 +++++++------------
 pom.xml     |  5 +++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ded85db..bacd52c 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,28 +14,23 @@ node {
     }
 
     withMaven(mavenConfiguration) {
+        def mvnParams = "-Dbuild.number=${BUILD_NUMBER}"
+
         stage('Build') {
-            sh 'mvn clean compile'
+            sh "mvn ${mvnParams} clean compile"
         }
 
         stage('Test') {
-            sh 'mvn test'
+            sh "mvn ${mvnParams} test"
         }
 
         stage('Package') {
-            sh 'mvn -DskipStatic -DskipTests package'
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests package"
         }
 
         stage('Deploy') {
-            // Figure out Pom version
-            def pom = readFile('pom.xml')
-            def versionMatch = pom =~ "<version>(.+?)</version>"
-            def version = versionMatch[0][1]
-
-            // Start deployment
-            sh 'mvn -DskipStatic -DskipTests deploy'
-            if ( ! version.contains("SNAPSHOT"))
-                sh 'mvn scm:tag'
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests deploy"
+            sh "mvn ${mvnParams} scm:tag"
         }
     }
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1c109de..53faf97 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>se.koc</groupId>
     <artifactId>zutil</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2-${build.number}</version>
     <packaging>jar</packaging>
 
     <name>Zutil</name>
@@ -34,6 +34,7 @@
     </scm>
 
     <properties>
+        <build.number>SNAPSHOT</build.number>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.scm.id>koc.se</project.scm.id>
@@ -173,7 +174,7 @@
                 <artifactId>maven-scm-plugin</artifactId>
                 <version>1.9.5</version>
                 <configuration>
-                    <tag>${project.artifactId}-${project.version}</tag>
+                    <tag>${project.version}</tag>
                     <connectionType>developerConnection</connectionType>
                 </configuration>
             </plugin>