diff --git a/Jenkinsfile b/Jenkinsfile index 3c2783c5eadc43d5784f5a790f0b99f691e4da6e..2637bbf06e932587494a5cf667d99a975c621bd6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { steps { script { FAILED_STAGE = env.STAGE_NAME - def rootVersion = getPomVersion('pom.xml') + def rootVersion = getPomVersion() if(isReleaseBranch()){ if ( !(rootVersion ==~ RELEASE_REGEX)) { @@ -50,7 +50,7 @@ pipeline { steps { script { FAILED_STAGE=env.STAGE_NAME - JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") + JAR_TAG = getPomVersion().replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" @@ -167,7 +167,7 @@ pipeline { stage ('Deploy SBOM to DependencyTrack') { steps { script { - IMAGE_TAG = buildVersionName('pom.xml') + IMAGE_TAG = buildVersionName() configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) { @@ -222,8 +222,8 @@ Boolean isReleaseBranch() { return env.BRANCH_NAME == 'release' } -String getPomVersion(String pomFile){ - def pom = readMavenPom file: pomFile +String getPomVersion(){ + def pom = readMavenPom file: 'pom.xml' return pom.version } @@ -277,18 +277,18 @@ Void loginToDockerRepo() { } -String buildVersionName(String pomFile) { +String buildVersionName() { if (isReleaseBranch()) { - return getPomVersion(pomFile) + return getPomVersion() } - return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-") + return "${getPomVersion()}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-") } Void tagAndPushDockerImage(String newTag){ withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' - sh "docker tag docker.ozg-sh.de/xta-test-server:${getPomVersion('pom.xml')} docker.ozg-sh.de/xta-test-server:${newTag}" + sh "docker tag docker.ozg-sh.de/xta-test-server:${getPomVersion()} docker.ozg-sh.de/xta-test-server:${newTag}" sh "docker push docker.ozg-sh.de/xta-test-server:${newTag}" } }