Commit cc03aac2 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

refactor: use plugins shorthand

parent 93cd62b8

templates/gitlab-ci-maven.yml

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ stages: 
    git config --global user.email "${GITLAB_USER_EMAIL}"

    git config --global user.name "${GITLAB_USER_NAME}"

    # shellcheck disable=SC2086

    scm_url=$(mvn $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.scm.developerConnection -q -DforceStdout | tail -n 1)

    scm_url=$(mvn $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args help:evaluate -Dexpression=project.scm.developerConnection -q -DforceStdout | tail -n 1)

    if [[ $scm_url == "scm:git:https"* ]]; then

      if [[ -n "${GIT_USERNAME}" ]] && [[ -n "${GIT_PASSWORD}" ]]; then

        log_info "--- using SCM credentials from env (\$GIT_USERNAME and \$GIT_PASSWORD)..."
@@ -382,7 +382,7 @@ stages: 


  function mvn_deploy() {

    # shellcheck disable=SC2086

    pom_version=$(mvn $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout | tail -n 1)

    pom_version=$(mvn $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args help:evaluate -Dexpression=project.version -q -DforceStdout | tail -n 1)

    if [[ "$CI_COMMIT_TAG" ]] && [[ "$pom_version" =~ -SNAPSHOT$ ]]

    then

      log_warn "Can't publish SNAPSHOT version \\e[33;1m${pom_version}\\e[0m from tag: skip"
@@ -506,7 +506,7 @@ mvn-no-snapshot-deps: 
  stage: test

  needs: []

  script:

    - mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args org.apache.maven.plugins:maven-enforcer-plugin:3.0.0:enforce -Drules=requireReleaseDeps

    - mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args enforcer:enforce -Drules=requireReleaseDeps

  rules:

    # exclude if disabled

    - if: '$MVN_FORBID_SNAPSHOT_DEPENDENCIES_DISABLED == "true"'