diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0aa60fa4dab59b06fb970822a09639aff9173f..7a118c47f2da0c3eac39432170a8227abe0967e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.1.0](https://gitlab.com/to-be-continuous/maven/compare/2.0.1...2.1.0) (2021-09-13) + + +### Features + +* auto-detect Maven settings file ([70f04e3](https://gitlab.com/to-be-continuous/maven/commit/70f04e3c4e9fb50b471fd1d832ffcfec1d76f411)) + ## [2.0.1](https://gitlab.com/to-be-continuous/maven/compare/2.0.0...2.0.1) (2021-09-07) ### Bug Fixes diff --git a/README.md b/README.md index 453d89243027b7f0d2a7a14083e17cd6904371a1..3242b95d1c41e9b8071ede5eac4946ed5e732dc4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ In order to include this template in your project, add the following to your `gi ```yaml include: - project: 'to-be-continuous/maven' - ref: '2.0.1' + ref: '2.1.0' file: '/templates/gitlab-ci-maven.yml' ``` diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml index 79eb32c211af23fcb1d8b3aa7048fcfa91baf2c4..31bfdd042a993aba0831f359a1c1ec387b8a8e00 100644 --- a/templates/gitlab-ci-maven.yml +++ b/templates/gitlab-ci-maven.yml @@ -434,7 +434,7 @@ stages: esac } - if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update maven "2.0.1"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update maven "2.1.0"; fi unscope_variables # ENDSCRIPT @@ -444,7 +444,7 @@ stages: image: $MAVEN_IMAGE services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "maven", "2.0.1" ] + command: ["--service", "maven", "2.1.0" ] before_script: - *mvn-scripts - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"