diff --git a/CHANGELOG.md b/CHANGELOG.md index 09588a1ce596a0e23b261d12d468f029fd043238..f330d0b1da7e27c6acb096756f371b7451c900ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.11.0](https://gitlab.com/to-be-continuous/maven/compare/3.10.2...3.11.0) (2024-07-10) + + +### Features + +* **sbom:** update default SBOM options to include Java catalogers when using the Jib variant ([eb23b26](https://gitlab.com/to-be-continuous/maven/commit/eb23b2608632216d09f949234f18a507028bcf42)) + ## [3.10.2](https://gitlab.com/to-be-continuous/maven/compare/3.10.1...3.10.2) (2024-07-06) diff --git a/README.md b/README.md index 43c8cd266485efdb3454f17b707c94f8189275b8..befaa3188ffade9f0e60124d0b6d2564fa609ebc 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: gitlab.com/to-be-continuous/maven/gitlab-ci-maven@3.10.2 + - component: gitlab.com/to-be-continuous/maven/gitlab-ci-maven@3.11.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.10.2' + ref: '3.11.0' file: '/templates/gitlab-ci-maven.yml' variables: @@ -526,7 +526,7 @@ All authentication methods should use masked GitLab environment variables. ```yaml include: # main template - - component: gitlab.com/to-be-continuous/maven/gitlab-ci-maven@3.10.2 + - component: gitlab.com/to-be-continuous/maven/gitlab-ci-maven@3.11.0 # Jib is implemented as an extension to Maven, and uses supporting features of the TBC Maven template - - component: gitlab.com/to-be-continuous/maven/gitlab-ci-maven-jib@3.10.2 + - component: gitlab.com/to-be-continuous/maven/gitlab-ci-maven-jib@3.11.0 ``` diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml index a1fdd7aaaf989be1ec6e67b961ea324d3b2a6c2b..33e8fa77ae968882b8069610155fd4a81a9767fd 100644 --- a/templates/gitlab-ci-maven.yml +++ b/templates/gitlab-ci-maven.yml @@ -598,7 +598,7 @@ stages: image: $MAVEN_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "maven", "3.10.2"] + command: ["--service", "maven", "3.11.0"] before_script: - !reference [.mvn-scripts] - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"