diff --git a/Jenkinsfile b/Jenkinsfile index a010a6b5..a96d7409 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -988,7 +988,16 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1 mavenLocalRepo: ".m2/repository-jdk-$deployJdk", jdk: "jdk-$deployJdk" ) { - sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy" + // "publish" profile may not be enabled at the same time as "development" profile, + // disable for any project that always has "development" profile enabled. + sh """#!/bin/bash +if [ -f profile.d/development ] +then + ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy deploy +else + ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy +fi +""" } // Restore surefire-reports sh restoreSurefireReportsScript() diff --git a/book/Jenkinsfile b/book/Jenkinsfile index e6c0e577..480258e0 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -969,7 +969,16 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1 mavenLocalRepo: ".m2/repository-jdk-$deployJdk", jdk: "jdk-$deployJdk" ) { - sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy" + // "publish" profile may not be enabled at the same time as "development" profile, + // disable for any project that always has "development" profile enabled. + sh """#!/bin/bash +if [ -f profile.d/development ] +then + ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy deploy +else + ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy +fi +""" } // Restore surefire-reports sh restoreSurefireReportsScript()