[sling-tooling-jenkins] branch master updated: SLING-8577 - Jenkins builds fail if the project inherits the version from the parent

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git


The following commit(s) were added to refs/heads/master by this push:
     new 2414e79  SLING-8577 - Jenkins builds fail if the project inherits the version from the parent
2414e79 is described below

commit 2414e79ecb37c370750acb13eabf90a8046c9754
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jul 12 12:33:14 2019 +0300

    SLING-8577 - Jenkins builds fail if the project inherits the version from the parent
---
 vars/slingOsgiBundleBuild.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index f446ab7..f02f86d 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -94,7 +94,8 @@ def defineStage(def globalConfig, def jobConfig, def jdkVersion, def isReference
     // also do not deploy non-SNAPSHOT versions
     if ( goal == "deploy" ) {
         def notMaster =  env.BRANCH_NAME != "master"
-        def mavenVersion = readMavenPom().version
+        def mavenPom = readMavenPom()
+        def mavenVersion = mavenPom.version ?: mavenPom.parent.version
         def isSnapshot = mavenVersion.endsWith('-SNAPSHOT')
         if ( notMaster || !isSnapshot ) {
             goal = "verify"