Merge pull request #23 from kemitix/hotfix/0.5.1

pom: fix accidental merge of SNAPSHOT into master
This commit is contained in:
Paul Campbell 2018-03-03 12:02:12 +00:00 committed by GitHub
commit aa888c8b06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions

View file

@ -1,6 +1,11 @@
CHANGELOG
=========
0.5.1
-----
* Fix accidental merge with SNAPSHOT version in to master
0.5.0
-----

View file

@ -9,6 +9,18 @@ pipeline {
git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix'
}
}
stage('no SNAPSHOT in master') {
// checks that the pom version is not a snapshot when the current branch is master
// TODO: also check for SNAPSHOT when is a pull request with master as the target branch
when {
expression {
(env.GIT_BRANCH == 'master') &&
(readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") }
}
steps {
error("Build failed because SNAPSHOT version")
}
}
stage('Build') {
parallel {
stage('Java 8') {

View file

@ -11,7 +11,7 @@
<relativePath/>
</parent>
<artifactId>mon</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.5.1</version>
<properties>
<java.version>1.8</java.version>