diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b16d2d50d36b64ce4d35f7d350058e873efe43b..c68000fb7b46bec752387bcf3c9c648a245405ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [4.0.0](https://gitlab.com/to-be-continuous/maven/compare/3.11.4...4.0.0) (2024-11-26) + + +### Code Refactoring + +* **jib/trivy:** enforce usage of Trivy environment variables ([e62f19e](https://gitlab.com/to-be-continuous/maven/commit/e62f19e98367595b58f07d9275371f75697dc33c)) + + +### BREAKING CHANGES + +* **jib/trivy:** 2 Trivy configuration params removed in favor of the native Trivy environment variables + ## [3.11.4](https://gitlab.com/to-be-continuous/maven/compare/3.11.3...3.11.4) (2024-10-24) diff --git a/README.md b/README.md index c8704d5961d5dda803c8355720ba7c50f3c55b2f..766b264e73c3781b1cccee7e2e41985a0b418ddf 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`: ```yaml include: # 1: include the component - - component: $CI_SERVER_FQDN/to-be-continuous/maven/gitlab-ci-maven@3.11.4 + - component: $CI_SERVER_FQDN/to-be-continuous/maven/gitlab-ci-maven@4.0.0 # 2: set/override component inputs inputs: # âš this is only an example @@ -30,7 +30,7 @@ Add the following to your `.gitlab-ci.yml`: include: # 1: include the template - project: 'to-be-continuous/maven' - ref: '3.11.4' + ref: '4.0.0' file: '/templates/gitlab-ci-maven.yml' variables: @@ -532,7 +532,7 @@ All authentication methods should use masked GitLab environment variables. ```yaml include: # main template - - component: $CI_SERVER_FQDN/to-be-continuous/maven/gitlab-ci-maven@3.11.4 + - component: $CI_SERVER_FQDN/to-be-continuous/maven/gitlab-ci-maven@4.0.0 # Jib is implemented as an extension to Maven, and uses supporting features of the TBC Maven template - - component: $CI_SERVER_FQDN/to-be-continuous/maven/gitlab-ci-maven-jib@3.11.4 + - component: $CI_SERVER_FQDN/to-be-continuous/maven/gitlab-ci-maven-jib@4.0.0 ``` diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml index 884bd0d1aa0b93fba77e6e802f13fcd47fa64447..9ae117c7d9345d988629dd95d3be6acd58f0b647 100644 --- a/templates/gitlab-ci-maven.yml +++ b/templates/gitlab-ci-maven.yml @@ -603,7 +603,7 @@ stages: image: $MAVEN_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "maven", "3.11.4"] + command: ["--service", "maven", "4.0.0"] before_script: - !reference [.mvn-scripts] - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"