From 5e28fbb65dfc2564ebeb8c5c5e3ca03af61e9a42 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 4 Mar 2018 17:50:56 +0000
Subject: [PATCH] jenkins: build and deploy using Java 9

---
 Jenkinsfile.groovy | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 0e18978..68be5c8 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -23,20 +23,9 @@ pipeline {
             }
         }
         stage('Build') {
-            parallel {
-                stage('Java 8') {
-                    steps {
-                        withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
-                            sh "${mvn} clean install"
-                        }
-                    }
-                }
-                stage('Java 9') {
-                    steps {
-                        withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
-                            sh 'mvn clean install'
-                        }
-                    }
+            steps {
+                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
+                    sh 'mvn clean install'
                 }
             }
         }
@@ -48,7 +37,7 @@ pipeline {
         stage('Deploy') {
             when { expression { (env.GIT_BRANCH == 'master') } }
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
+                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
                     sh "${mvn} deploy --activate-profiles release -DskipTests=true"
                 }
             }