updated build scripts

Jenkinsfile

@@ -1,40 +1,36 @@
+#!groovy
 // Jenkinsfile (Pipeline Script)
+
+mavenConfiguration = [
+        jdk: "jdk7",
+        maven: "m3.5",
+        mavenLocalRepo: ".repository",
+        mavenSettingsConfig: "639c4560-87b7-4502-bb3d-2c44845cd2b5"
+]
+
 node {
-    // Configure environment
-    //env.JAVA_HOME = tool name: 'JDK8'
-    env.REPO_URL = "repo.koc.se/zallery.git"
-    env.BUILD_NAME = "BUILD-" + env.BUILD_ID
-
-
-    checkout scm
-
-    stage('Build') {
-        sh 'ant clean'
-        sh 'ant build'
+    stage('Checkout') {
+        checkout scm
     }
 
-    stage('Package') {
-        sh 'ant package'
-        archiveArtifacts artifacts: 'build/release/*', fingerprint: true
+    withMaven(mavenConfiguration) {
+        def mvnParams = "-Dbuild.number=${BUILD_NUMBER}"
 
-        // Tag artifact
-        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'f8e5f6c6-4adb-4ab2-bb5d-1c8535dff491',
-                                      usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-            sh "git tag ${env.BUILD_NAME}"
-            sh "git push 'https://${USERNAME}:${PASSWORD}@${env.REPO_URL}' ${env.BUILD_NAME}"
+        stage('Build') {
+            sh "mvn ${mvnParams} clean compile"
+        }
+
+        stage('Test') {
+            sh "mvn ${mvnParams} test"
+        }
+
+        stage('Package') {
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests package"
+        }
+
+        stage('Deploy') {
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests deploy"
+            sh "mvn ${mvnParams} scm:tag"
         }
     }
-}
-
-stage('Deploy') {
-    timeout(time:2, unit:'HOURS') {
-        input message: 'Deploy?', submitter: 'ziver'
-    }
-    node {
-        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: '46f1d99b-2037-47b9-a7b7-57a1066337fc',
-                                      usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-            sh 'ant -Dtomcat.user=${USERNAME} -Dtomcat.pass=${PASSWORD} deploy'
-        }
-    }
-}
-
+}