From 13b6ebd06ddab678dfed60444041b48e7344b6ca Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 3 Mar 2018 16:28:50 +0000
Subject: [PATCH 1/4] jenkins: remove java 9 testing from develop branch

---
 Jenkinsfile.groovy | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 9eb564f..1d8fe5e 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -30,14 +30,6 @@ pipeline {
                         }
                     }
                 }
-                // requires maven-failsafe-plugin:2.21 when it is released
-//                stage('Java 9') {
-//                    steps {
-//                        withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
-//                            sh 'mvn clean install'
-//                        }
-//                    }
-//                }
             }
         }
         stage('Reporting') {

From fa63f2f1045752675d73f7994dbde7b49884d52e Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 3 Mar 2018 16:29:38 +0000
Subject: [PATCH 2/4] jenkins: split Reporting stage into Test Results and
 Archiving

---
 Jenkinsfile.groovy | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 1d8fe5e..a2f7898 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -32,9 +32,13 @@ pipeline {
                 }
             }
         }
-        stage('Reporting') {
+        stage('Test Results') {
             steps {
                 junit '**/target/surefire-reports/*.xml'
+            }
+        }
+        stage('Archiving') {
+            steps {
                 archiveArtifacts '**/target/*.jar'
             }
         }

From edf98ed593bbf0a6d68423dde9876919ebfcb5a5 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 3 Mar 2018 16:30:01 +0000
Subject: [PATCH 3/4] jenkins: add Coverage stage

---
 Jenkinsfile.groovy | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index a2f7898..f218cb9 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -42,6 +42,11 @@ pipeline {
                 archiveArtifacts '**/target/*.jar'
             }
         }
+        stage('Coverage') {
+            steps {
+                jacoco(execPattern: '**/target/jacoco.exec')
+            }
+        }
         stage('Deploy') {
             when { expression { (env.GIT_BRANCH == 'master') } }
             steps {

From 87d1dea399bc526133423e5fa7bdf8bf90be99f9 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 3 Mar 2018 22:29:05 +0000
Subject: [PATCH 4/4] CHANGELOG

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b5e231b..3e06a9d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+0.6.0
+-----
+
+* jenkins: add Coverage stage
+* jenkins: split Reporting stage into Test Results and Archiving
+* jenkins: remove java 9 testing from `develop` branch
+
 0.5.1
 -----