From 4215cb5d19e8f434962daea503c870ad67f1e916 Mon Sep 17 00:00:00 2001 From: "AO Industries, Inc" Date: Tue, 19 Sep 2023 09:28:19 +0000 Subject: [PATCH] devMode may be "true" only for projects that have profile.d/development which never publish anything. --- Jenkinsfile | 11 +---------- book/Jenkinsfile | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 53f75ac..e07ab38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -973,16 +973,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 index c8a04d8..519a0fd 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -973,16 +973,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()