diff --git a/CHANGELOG.md b/CHANGELOG.md index 23f36c90780efb785c189777d88d7561cf2e2312..d5d67e884b57dbfcbf8944f8c63def30687e7b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.6.1](https://gitlab.com/to-be-continuous/maven/compare/3.6.0...3.6.1) (2023-09-19) + + +### Bug Fixes + +* **release:** fix and clarify Git config in release process ([58320af](https://gitlab.com/to-be-continuous/maven/commit/58320afad0b80d1da398240a19774922daac2bf2)) + # [3.6.0](https://gitlab.com/to-be-continuous/maven/compare/3.5.0...3.6.0) (2023-07-02) diff --git a/README.md b/README.md index 630528a26bf4075acdbf7064162606ddff3c7a43..f770a9c74fcd430dc4655f38562373089765d481 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `gi ```yaml include: - project: 'to-be-continuous/maven' - ref: '3.6.0' + ref: '3.6.1' file: '/templates/gitlab-ci-maven.yml' ``` @@ -439,11 +439,11 @@ All authentication methods should use masked GitLab environment variables. include: # main template - project: 'to-be-continuous/maven' - ref: '3.6.0' + ref: '3.6.1' file: '/templates/gitlab-ci-maven.yml' # Jib is implemented as an extension to Maven, and uses supporting features of the TBC Maven template - project: 'to-be-continuous/maven' - ref: '3.6.0' + ref: '3.6.1' file: '/templates/gitlab-ci-maven-jib.yml' variables: diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml index 3911eef1e90852251b5f5c2c20d468a33742c678..e98afae058e05ecbe3273cd4b578940f02eb0e6b 100644 --- a/templates/gitlab-ci-maven.yml +++ b/templates/gitlab-ci-maven.yml @@ -398,7 +398,7 @@ stages: image: $MAVEN_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "maven", "3.6.0" ] + command: ["--service", "maven", "3.6.1" ] before_script: - *mvn-scripts - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"