From c26fe1c097c5e3fed16002f412aceeeb7f7d460a Mon Sep 17 00:00:00 2001 From: Julien Carsique Date: Thu, 20 Nov 2025 18:06:19 +0100 Subject: [PATCH] BUILD-9760 fix USER_MAVEN_ARGS --- build-maven/action.yml | 2 +- build-maven/build.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build-maven/action.yml b/build-maven/action.yml index bcbee76..8ff7485 100644 --- a/build-maven/action.yml +++ b/build-maven/action.yml @@ -174,7 +174,7 @@ runs: SIGN_KEY: ${{ fromJSON(steps.secrets.outputs.vault).SIGN_KEY }} PGP_PASSPHRASE: ${{ fromJSON(steps.secrets.outputs.vault).PGP_PASSPHRASE }} working-directory: ${{ inputs.working-directory }} - run: $ACTION_PATH_BUILD_MAVEN/build.sh + run: $ACTION_PATH_BUILD_MAVEN/build.sh $USER_MAVEN_ARGS - name: Cleanup Maven repository before caching shell: bash diff --git a/build-maven/build.sh b/build-maven/build.sh index f8019eb..4f87efb 100755 --- a/build-maven/build.sh +++ b/build-maven/build.sh @@ -37,7 +37,6 @@ # - DEPLOY_PULL_REQUEST: Whether to deploy pull request artifacts (default: false) # - SONAR_SCANNER_JAVA_OPTS: JVM options for SonarQube scanner (e.g. -Xmx512m) # - SCANNER_VERSION: SonarQube Maven plugin version (default: 5.1.0.4751) -# - USER_MAVEN_ARGS: Additional arguments to pass to Maven # shellcheck source-path=SCRIPTDIR set -euo pipefail @@ -60,7 +59,6 @@ fi : "${RUN_SHADOW_SCANS:?}" : "${DEPLOY_PULL_REQUEST:=false}" : "${DEPLOY:=true}" -: "${USER_MAVEN_ARGS:=}" export ARTIFACTORY_URL DEPLOY_PULL_REQUEST # FIXME Workaround for SonarSource parent POM; it can be removed after releases of parent 73+ and parent-oss 84+ @@ -240,6 +238,5 @@ export_built_artifacts() { } if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - # shellcheck disable=SC2086 - build_maven $USER_MAVEN_ARGS + build_maven "$@" fi