From c15d9bb6594aea588f903013e55596dc1a231ef6 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 6 Oct 2017 17:13:45 +0200
Subject: [PATCH] fixed CI issues with maven

---
 Jenkinsfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fa70dd6..cde1c23 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,21 +1,22 @@
-#!groovy​
+#!groovy
 // Jenkinsfile (Pipeline Script)
 node {
     // Configure environment
     env.REPO_URL = "repo.koc.se/zutil-java.git" //scm.getUserRemoteConfigs()[0].getUrl()
     env.BUILD_NAME = "BUILD-" + env.BUILD_ID
 
+    stage('Checkout') {
+        git url: "https://" + env.REPO_URL
+    }
 
-    checkout scm
-
-    withMaven(JDK: "JDK8") {
+    withMaven(jdk: "jdk8", maven: "m3.5", mavenLocalRepo: ".repository") {
 
         stage('Build') {
             sh 'mvn clean compile'
         }
 
         stage('Test') {
-            sh 'mvn surefire:test failsafe:integration-test'
+            sh 'mvn test'
         }
 
         stage('Package') {
@@ -23,7 +24,7 @@ node {
 
             // Tag artifact
             withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'f8e5f6c6-4adb-4ab2-bb5d-1c8535dff491',
-                                          usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
+                              usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
                 sh "git tag ${env.BUILD_NAME}"
                 sh "git push 'https://${USERNAME}:${PASSWORD}@${env.REPO_URL}' ${env.BUILD_NAME}"
             }