Skip to content
Snippets Groups Projects
Commit f3164e86 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: sanitize variable substitution pattern

replace '${foo+repl}' pattern with '${foo:+repl}' (latest supports $foo being defined but empty)
parent 34c2c917
No related branches found
No related tags found
No related merge requests found
...@@ -491,7 +491,7 @@ stages: ...@@ -491,7 +491,7 @@ stages:
else else
log_info "Publish version \\e[33;1m${pom_version}\\e[0m..." log_info "Publish version \\e[33;1m${pom_version}\\e[0m..."
# shellcheck disable=SC2086 # shellcheck disable=SC2086
mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $MAVEN_DEPLOY_ARGS mvn ${TRACE:+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $MAVEN_DEPLOY_ARGS
fi fi
} }
...@@ -542,7 +542,7 @@ mvn-build: ...@@ -542,7 +542,7 @@ mvn-build:
stage: build stage: build
script: script:
- maybe_inject_slug_in_version - maybe_inject_slug_in_version
- mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $MAVEN_BUILD_ARGS - mvn ${TRACE:+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $MAVEN_BUILD_ARGS
- output_coverage - output_coverage
# code coverage RegEx # code coverage RegEx
coverage: '/^(\d+\.?\d*\%) covered$/' coverage: '/^(\d+\.?\d*\%) covered$/'
...@@ -586,10 +586,10 @@ mvn-sonar: ...@@ -586,10 +586,10 @@ mvn-sonar:
export SONAR_TOKEN="$SONAR_AUTH_TOKEN" export SONAR_TOKEN="$SONAR_AUTH_TOKEN"
fi fi
- >- - >-
mvn ${TRACE+-Dsonar.verbose=true} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args mvn ${TRACE:+-Dsonar.verbose=true} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args
${SONAR_LOGIN+-Dsonar.login=$SONAR_LOGIN} ${SONAR_LOGIN:+-Dsonar.login=$SONAR_LOGIN}
${SONAR_PASSWORD+-Dsonar.password=$SONAR_PASSWORD} ${SONAR_PASSWORD:+-Dsonar.password=$SONAR_PASSWORD}
${SONAR_QUALITY_GATE_ENABLED+-Dsonar.qualitygate.wait=$SONAR_QUALITY_GATE_ENABLED} ${SONAR_QUALITY_GATE_ENABLED:+-Dsonar.qualitygate.wait=$SONAR_QUALITY_GATE_ENABLED}
$SONAR_BASE_ARGS $SONAR_BASE_ARGS
rules: rules:
# exclude if $SONAR_URL and $SONAR_HOST_URL not set # exclude if $SONAR_URL and $SONAR_HOST_URL not set
...@@ -603,7 +603,7 @@ mvn-dependency-check: ...@@ -603,7 +603,7 @@ mvn-dependency-check:
# force no dependency # force no dependency
dependencies: [] dependencies: []
script: script:
- mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $MAVEN_DEPENDENCY_CHECK_ARGS - mvn ${TRACE:+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $MAVEN_DEPENDENCY_CHECK_ARGS
artifacts: artifacts:
name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG" name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"
expire_in: 1 day expire_in: 1 day
...@@ -627,7 +627,7 @@ mvn-no-snapshot-deps: ...@@ -627,7 +627,7 @@ mvn-no-snapshot-deps:
stage: test stage: test
needs: [] needs: []
script: script:
- mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args enforcer:enforce -Drules=requireReleaseDeps - mvn ${TRACE:+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args enforcer:enforce -Drules=requireReleaseDeps
rules: rules:
# exclude if disabled # exclude if disabled
- if: '$MVN_FORBID_SNAPSHOT_DEPENDENCIES_DISABLED == "true"' - if: '$MVN_FORBID_SNAPSHOT_DEPENDENCIES_DISABLED == "true"'
...@@ -706,12 +706,12 @@ mvn-release: ...@@ -706,12 +706,12 @@ mvn-release:
fi fi
fi fi
- >- - >-
mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args mvn ${TRACE:+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args
${scm_auth_args} ${semrel_args} ${scm_auth_args} ${semrel_args}
${MAVEN_RELEASE_VERSION+-DreleaseVersion="$MAVEN_RELEASE_VERSION"} ${MAVEN_RELEASE_VERSION:+-DreleaseVersion="$MAVEN_RELEASE_VERSION"}
${MAVEN_RELEASE_SCM_COMMENT_PREFIX+-DscmCommentPrefix="$MAVEN_RELEASE_SCM_COMMENT_PREFIX"} ${MAVEN_RELEASE_SCM_COMMENT_PREFIX:+-DscmCommentPrefix="$MAVEN_RELEASE_SCM_COMMENT_PREFIX"}
${MAVEN_RELEASE_SCM_RELEASE_COMMENT+-DscmReleaseCommitComment="$MAVEN_RELEASE_SCM_RELEASE_COMMENT"} ${MAVEN_RELEASE_SCM_RELEASE_COMMENT:+-DscmReleaseCommitComment="$MAVEN_RELEASE_SCM_RELEASE_COMMENT"}
${MAVEN_RELEASE_SCM_DEV_COMMENT+-DscmDevelopmentCommitComment="$MAVEN_RELEASE_SCM_DEV_COMMENT"} ${MAVEN_RELEASE_SCM_DEV_COMMENT:+-DscmDevelopmentCommitComment="$MAVEN_RELEASE_SCM_DEV_COMMENT"}
${MAVEN_RELEASE_ARGS} ${MAVEN_RELEASE_ARGS}
rules: rules:
# exclude if $MAVEN_DEPLOY_ENABLED not set # exclude if $MAVEN_DEPLOY_ENABLED not set
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment