From 7c3321d400ceec2e73bcb409900cbdb5fb3e8778 Mon Sep 17 00:00:00 2001 From: "AO Industries, Inc" Date: Tue, 19 Sep 2023 09:26:45 +0000 Subject: [PATCH] devMode may be "true" only for projects that have profile.d/development which never publish anything. --- Jenkinsfile | 11 +---------- all | 2 +- bom | 2 +- book/Jenkinsfile | 11 +---------- model | 2 +- servlet | 2 +- style | 2 +- taglib | 2 +- view | 2 +- 9 files changed, 9 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 01d5834..1427b9e 100644 --- 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 index 8a4dfcd..63b8705 160000 --- a/all +++ b/all @@ -1 +1 @@ -Subproject commit 8a4dfcd08e7bf858e7ec888369cd5b55d8011b53 +Subproject commit 63b8705efe0d96da4a8fbd557b91d8b0adf4ea13 diff --git a/bom b/bom index 79beda5..73434c1 160000 --- a/bom +++ b/bom @@ -1 +1 @@ -Subproject commit 79beda5977636e2fb4b7aab617d1c847ba6ecc80 +Subproject commit 73434c12c414e598f3c048d1e89b7d1b9c6bc4fc diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 8f97f83..3badad6 100644 --- 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 index 0ea676a..cd916c2 160000 --- a/model +++ b/model @@ -1 +1 @@ -Subproject commit 0ea676aa0f5a2b56a2f91cdd2c307a54ecb495fa +Subproject commit cd916c20c5218480b1e6447136bab7713e177b2a diff --git a/servlet b/servlet index 12e30f0..989e513 160000 --- a/servlet +++ b/servlet @@ -1 +1 @@ -Subproject commit 12e30f0225881be5998479ee692d7c9ff403847c +Subproject commit 989e51361f71578c304108443cd33b4ab7221948 diff --git a/style b/style index d49d4d2..8f10a0f 160000 --- a/style +++ b/style @@ -1 +1 @@ -Subproject commit d49d4d2ebd8ccd5b4858d3970955a02859b3c120 +Subproject commit 8f10a0fcc124242e621bd3b1711b4a0f27bb1397 diff --git a/taglib b/taglib index 5c21dbf..6d67825 160000 --- a/taglib +++ b/taglib @@ -1 +1 @@ -Subproject commit 5c21dbf2eed8d6d52ea659b175a16f61b43ef8be +Subproject commit 6d67825be0267af329745aa243841b95f9a40f98 diff --git a/view b/view index 8e24058..4537a75 160000 --- a/view +++ b/view @@ -1 +1 @@ -Subproject commit 8e24058afe1c679e2d04cfcfe08c0cce3b5fc1cd +Subproject commit 4537a7588a121e55d69cf291c8632d9a5087ec7f