diff --git a/Jenkinsfile b/Jenkinsfile index aabedb0..d277154 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,8 +40,10 @@ pipeline { stage('Release to artifactory') { when { - branch 'issue/*' - not { triggeredBy 'UpstreamCause' } + anyOf { + branch 'master' + not { triggeredBy 'UpstreamCause' } + } } agent { docker { @@ -68,8 +70,8 @@ pipeline { '-Dmaven.test.skip=true clean deploy -B' } } - - stage('Release to artifactory with docs') { + + stage('Publish documentation') { when { branch 'master' } @@ -87,14 +89,11 @@ pipeline { } steps { - sh 'rm -rf ?' - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' + + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' + '-Dartifactory.server=https://repo.spring.io ' + "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=libs-snapshot-local " + - "-Dartifactory.build-name=spring-data-r2dbc " + - "-Dartifactory.build-number=${BUILD_NUMBER} " + + "-Dartifactory.distribution-repository=temp-private-local " + '-Dmaven.test.skip=true clean deploy -B' } }