devMode may be "true" only for projects that have profile.d/developme…

…nt which never publish anything.
ao-apps · Sep 19, 2023 · 7c3321d · 7c3321d
1 parent 8962772
commit 7c3321d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 27 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -949,16 +949,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/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -963,16 +963,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/model b/model
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view