Merge remote-tracking branch 'origin/1.x'

ao-apps · Sep 19, 2023 · 5478476 · 5478476
2 parents ef41f5c + ed42f44
commit 5478476
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -971,16 +971,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
-      // "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
-"""
+      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy"
     }
     // Restore surefire-reports
     sh restoreSurefireReportsScript()

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -968,16 +968,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
-      // "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
-"""
+      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy"
     }
     // Restore surefire-reports
     sh restoreSurefireReportsScript()