Merge pull request #24 from kemitix/prepare/0.6.0

Prepare/0.6.0
This commit is contained in:
Paul Campbell 2018-03-03 12:53:05 +00:00 committed by GitHub
commit 52cdab42b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions

View file

@ -1,6 +1,11 @@
CHANGELOG CHANGELOG
========= =========
0.5.1
-----
* Fix accidental merge with SNAPSHOT version in to master
0.5.0 0.5.0
----- -----
@ -9,7 +14,6 @@ CHANGELOG
* Add `BeanBuilder` experiment * Add `BeanBuilder` experiment
* Upgrade `lombok` to 1.16.20 * Upgrade `lombok` to 1.16.20
* Upgrade assertj to 3.9.1 * Upgrade assertj to 3.9.1
* jenkins: test on both java 8 and 9
0.4.0 0.4.0
----- -----

View file

@ -9,12 +9,24 @@ pipeline {
git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix' 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') { stage('Build') {
parallel { parallel {
stage('Java 8') { stage('Java 8') {
steps { steps {
withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
sh 'mvn clean install' sh "${mvn} clean install"
} }
} }
} }

View file

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