diff --git a/Jenkinsfile b/Jenkinsfile index ceae955dce318ec49930a58d4e8a8ead4c9e234a..5e8796769fde886b7f28923016e72948e43ec91e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { def rootVersion = getRootPomVersion() def zufiManagerServerVersion = getParentPomVersion('zufi-manager-server/pom.xml') def zufiManagerPvogVersion = getParentPomVersion('zufi-manager-pvog/pom.xml') - def zufiManagerInterfaceVersion = getParentPomVersion('zufi-manager-interface/pom.xml') + def zufiManagerInterfaceVersion = getPomVersion('zufi-manager-interface/pom.xml') def zufiManagerModelVersion = getParentPomVersion('zufi-manager-model/pom.xml') if (isReleaseBranch()) { @@ -436,8 +436,7 @@ Void performSonarCheck(String module) { } String getRootPomVersion() { - def rootPom = readMavenPom file: 'pom.xml' - return rootPom.version + return getPomVersion('pom.xml') } String getParentPomVersion(String filePath) { @@ -445,6 +444,11 @@ String getParentPomVersion(String filePath) { return pom.parent.version } +String getPomVersion(String pomFile){ + def pom = readMavenPom file: pomFile + return pom.version +} + String generateImageTag() { def imageTag = "${env.BRANCH_NAME}-${getRootPomVersion()}"