Merge branch 'develop' into jdk-9-compatible

This commit is contained in:
Paul Campbell 2018-03-04 10:05:15 +00:00 committed by GitHub
commit 5c62fbd74d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions

View file

@ -1,6 +1,13 @@
CHANGELOG 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 0.5.1
----- -----

View file

@ -30,7 +30,6 @@ pipeline {
} }
} }
} }
// requires maven-failsafe-plugin:2.21 when it is released
stage('Java 9') { stage('Java 9') {
steps { steps {
withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
@ -40,12 +39,21 @@ pipeline {
} }
} }
} }
stage('Reporting') { stage('Test Results') {
steps { steps {
junit '**/target/surefire-reports/*.xml' junit '**/target/surefire-reports/*.xml'
}
}
stage('Archiving') {
steps {
archiveArtifacts '**/target/*.jar' archiveArtifacts '**/target/*.jar'
} }
} }
stage('Coverage') {
steps {
jacoco(execPattern: '**/target/jacoco.exec')
}
}
stage('Deploy') { stage('Deploy') {
when { expression { (env.GIT_BRANCH == 'master') } } when { expression { (env.GIT_BRANCH == 'master') } }
steps { steps {