From e9af4d067cf0cf5a89899f1b43ff03f75080480e Mon Sep 17 00:00:00 2001
From: Olivier Gonzalez <52092-gonzoyumo@users.noreply.gitlab.com>
Date: Thu, 15 Feb 2024 04:01:54 +0000
Subject: [PATCH] Adjust CA deprecation for Maven
---
.../16-9-deprecate-maven-3.6.x.yml | 4 +--
doc/update/deprecations.md | 32 +++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/data/deprecations/16-9-deprecate-maven-3.6.x.yml b/data/deprecations/16-9-deprecate-maven-3.6.x.yml
index 0b0dd012f553b..e618661b396b6 100644
--- a/data/deprecations/16-9-deprecate-maven-3.6.x.yml
+++ b/data/deprecations/16-9-deprecate-maven-3.6.x.yml
@@ -1,4 +1,4 @@
-- title: "Deprecate Maven versions below 3.8.8"
+- title: "Maven versions below 3.8.8 support in Dependency Scanning and License Scanning"
removal_milestone: "17.0"
announcement_milestone: "16.9"
breaking_change: true
@@ -6,6 +6,6 @@
stage: Secure
issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/438772
body: | # (required) Don't change this line.
- GitLab 17.0 drops Dependency Scanning support for Maven versions below 3.8.8.
+ GitLab 17.0 drops Dependency Scanning and License Scanning support for Maven versions below 3.8.8.
Users are advised to upgrade to 3.8.8 or greater.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index ba76c30c9effb..2a849a583979b 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -634,22 +634,6 @@ Users are advised to use [License scanning of CycloneDX files](https://docs.gitl
<div class="deprecation breaking-change" data-milestone="17.0">
-### Deprecate Maven versions below 3.8.8
-
-<div class="deprecation-notes">
-- Announced in GitLab <span class="milestone">16.9</span>
-- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
-- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/438772).
-</div>
-
-GitLab 17.0 drops Dependency Scanning support for Maven versions below 3.8.8.
-
-Users are advised to upgrade to 3.8.8 or greater.
-
-</div>
-
-<div class="deprecation breaking-change" data-milestone="17.0">
-
### Deprecate Python 3.9 in Dependency Scanning and License Scanning
<div class="deprecation-notes">
@@ -1309,6 +1293,22 @@ settings for the group using either the GitLab UI or GraphQL API.
<div class="deprecation breaking-change" data-milestone="17.0">
+### Maven versions below 3.8.8 support in Dependency Scanning and License Scanning
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.9</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/438772).
+</div>
+
+GitLab 17.0 drops Dependency Scanning and License Scanning support for Maven versions below 3.8.8.
+
+Users are advised to upgrade to 3.8.8 or greater.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
### Min concurrency and max concurrency in Sidekiq options
<div class="deprecation-notes">
--
GitLab