Merge branch 'hotfix/0.5.1' into prepare/0.6.0

* hotfix/0.5.1:
  jenkins: fix syntax #5
  jenkins: fix syntax #4
  jenkins: fix syntax #3
  jenkins: strong type read pom
  jenkins: fix syntax #2
  jenkins: fix syntax
  Revert "version set to 0.6.0-SNAPSHOT"
This commit is contained in:
Paul Campbell 2018-03-03 12:37:22 +00:00
commit 267bc8f077
2 changed files with 2 additions and 5 deletions

View file

@ -16,10 +16,7 @@ pipeline {
when { when {
expression { expression {
(env.GIT_BRANCH == 'master') && (env.GIT_BRANCH == 'master') &&
(pom.version).contains("SNAPSHOT") } (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") }
}
steps {
error("Build failed because SNAPSHOT version: ${pom.groupId}:${pom.artifactId}:${pom.version}")
} }
} }
stage('Build') { stage('Build') {

View file

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