Merge pull request #24 from kemitix/prepare/0.6.0

Prepare/0.6.0

CHANGELOG

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

Jenkinsfile.groovy

@@ -9,12 +9,24 @@ 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') {
                     steps {
                         withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
-                            sh 'mvn clean install'
+                            sh "${mvn} clean install"
                         }
                     }
                 }

pom.xml

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