Skip to content

Commit

Permalink
SDK-287 Only use changlist prop from maven to fill in branch name
Browse files Browse the repository at this point in the history
  • Loading branch information
bwand committed May 30, 2022
1 parent 5894a90 commit 762a2e8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Jenkinsfile
Expand Up @@ -38,7 +38,7 @@ node('master') {
echo "Build"
dir('njams-sdk') {
try {
sh "'${mvnHome}/bin/mvn' clean deploy -Psonar,jenkins-cli -Drevision=${version} -Dchangelist=-${branch} -DrevisionNumberPlugin.revision=${env.BUILD_NUMBER} -DscmBranch=${scmInfo.GIT_BRANCH} -DscmCommit=${scmInfo.GIT_COMMIT}"
sh "'${mvnHome}/bin/mvn' clean deploy -Psonar,jenkins-cli -Drevision=${version} -Dchangelist=${branch} -DrevisionNumberPlugin.revision=${env.BUILD_NUMBER} -DscmBranch=${scmInfo.GIT_BRANCH} -DscmCommit=${scmInfo.GIT_COMMIT}"
} finally {
junit 'target/surefire-reports/*.xml'
junit allowEmptyResults: true, testResults: 'target/failsafe-reports/*.xml'
Expand Down Expand Up @@ -67,7 +67,7 @@ node('master') {
echo "Build"
dir('njams-sdk-sample-client') {
try {
sh "'${mvnHome}/bin/mvn' clean deploy -Psonar,jenkins-cli -Drevision=${version} -Dchangelist=-${branch}"
sh "'${mvnHome}/bin/mvn' clean deploy -U -Psonar,jenkins-cli -Drevision=${version} -Dchangelist=${branch}"
} finally {
//junit 'target/surefire-reports/*.xml'
}
Expand All @@ -78,7 +78,7 @@ node('master') {
echo "Build Checkstyle"
dir('njams-sdk') {
try {
sh "'${mvnHome}/bin/mvn' site -Drevision=${version} -Dchangelist=-${branch}"
sh "'${mvnHome}/bin/mvn' site -Drevision=${version} -Dchangelist=${branch}"
} finally {
archiveArtifacts '**/checkstyle-result.xml'
}
Expand All @@ -99,7 +99,7 @@ node('master') {
stage('Javadoc') {
echo "Build Javadoc"
dir('njams-sdk') {
sh "'${mvnHome}/bin/mvn' javadoc:javadoc -Drevision=${version} -Dchangelist=-${branch}"
sh "'${mvnHome}/bin/mvn' javadoc:javadoc -Drevision=${version} -Dchangelist=${branch}"

publishHTML([allowMissing : false,
alwaysLinkToLastBuild: true,
Expand Down

0 comments on commit 762a2e8

Please sign in to comment.