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

Merge branch 'fix/maven-cli' into 'master' 

fix(maven): use Maven CLI options

Closes #32

See merge request to-be-continuous/maven!39
parents 5f30da6e 2be56aa7

README.md

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ The Maven template uses some global configuration throughout all jobs. 
| `MAVEN_IMAGE`         | The Docker image used to run Maven <br/>:warning: **set the version required by your project** | `maven:latest` |

| `MAVEN_PROJECT_DIR`   | Maven projet root directory | `.` |

| `MAVEN_CFG_DIR`       | The Maven configuration directory      | `.m2`             |

| `MAVEN_OPTS`          | [Global Maven options](http://maven.apache.org/configure.html#maven_opts-environment-variable) | `-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${MAVEN_CFG_DIR}/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true` |

| `MAVEN_CLI_OPTS`      | Additional [Maven options](https://maven.apache.org/ref/3-LATEST/maven-embedder/cli.html) used on the command line | `--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true` |

| `MAVEN_OPTS`          | [Global Maven options](http://maven.apache.org/configure.html#maven_opts-environment-variable) | `-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${MAVEN_CFG_DIR}/repository -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true` |

| `MAVEN_CLI_OPTS`      | Additional [Maven options](https://maven.apache.org/ref/3-LATEST/maven-embedder/cli.html) used on the command line | `--no-transfer-progress --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true` |



### About `$MAVEN_CFG_DIR`

kicker.json

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
    {

      "name": "MAVEN_OPTS",

      "description": "[Global Maven options](http://maven.apache.org/configure.html#maven_opts-environment-variable)",

      "default": "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${MAVEN_CFG_DIR}/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true",

      "default": "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=${MAVEN_CFG_DIR}/repository -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true",

      "advanced": true

    },

    {

      "name": "MAVEN_CLI_OPTS",

      "description": "Additional [Maven options](https://maven.apache.org/ref/3-LATEST/maven-embedder/cli.html) used on the command line",

      "default": "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true",

      "default": "--no-transfer-progress --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true",

      "advanced": true

    },

    {

templates/gitlab-ci-maven.yml

+1 −2
Original line number Diff line number Diff line
@@ -58,12 +58,10 @@ variables: 
  # default configuration directory

  MAVEN_CFG_DIR: ".m2"



  # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.

  # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.

  MAVEN_OPTS: >-

    -Dhttps.protocols=TLSv1.2

    -Dmaven.repo.local=${MAVEN_CFG_DIR}/repository

    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN

    -Dorg.slf4j.simpleLogger.showDateTime=true

    -Djava.awt.headless=true
@@ -71,6 +69,7 @@ variables: 
  # when running from the command line.

  # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.

  MAVEN_CLI_OPTS: >-

    --no-transfer-progress

    --batch-mode

    --errors

    --fail-at-end