Merge branch 'axil-fix-deprecation-milestone-dates' into 'master'

Fix wrong deprecation milestone dates

See merge request gitlab-org/gitlab!78359

data/deprecations/14.8-deprecate-artifacts-keyword.yml → data/deprecations/14-7-deprecate-artifacts-keyword.yml

 - name: "Removal of `artifacts:report:cobertura` keyword"
-  announcement_milestone: "14.8"
-  announcement_date: "2022-02-22"
+  announcement_milestone: "14.7"
+  announcement_date: "2022-01-22"
   removal_milestone: "15.0"
-  removal_date: "2022-06-22"
+  removal_date: "2022-05-22"
   breaking_change: false
   body: |
      Currently, test coverage visualizations in GitLab only support Cobertura reports. Starting 15.0, the

data/deprecations/14-7-deprecate-godep-support-in-license-compliance.yml

@@ -2,7 +2,7 @@
   announcement_milestone: "14.7" # The milestone when this feature was first announced as deprecated.
   announcement_date: "2022-01-22" # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "15.0" # The milestone when this feature is planned to be removed
-  removal_date: "2022-06-22" # This should almost always be the 22nd of a month (YYYY-MM-22), the date of the milestone release when this feature is planned to be removed.
+  removal_date: "2022-05-22" # This should almost always be the 22nd of a month (YYYY-MM-22), the date of the milestone release when this feature is planned to be removed.
   body: | # Do not modify this line, instead modify the lines below.
     The Godep dependency manager for Golang was deprecated in 2020 by Go and
     has been replaced with Go modules.

data/deprecations/14-7-pseudonymizer.yml

@@ -2,7 +2,7 @@
   announcement_milestone: "14.7" # The milestone when this feature was first announced as deprecated.
   announcement_date: "2021-01-22" # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "15.0" # The milestone when this feature is planned to be removed
-  removal_date: "2021-06-22" # This should almost always be the 22nd of a month (YYYY-MM-22), the date of the milestone release when this feature is planned to be removed.
+  removal_date: "2021-05-22" # This should almost always be the 22nd of a month (YYYY-MM-22), the date of the milestone release when this feature is planned to be removed.
   body: | # Do not modify this line, instead modify the lines below.
     The Pseudonymizer feature is generally unused,
     can cause production issues with large databases,

doc/update/deprecations.md

@@ -313,7 +313,7 @@ has been replaced with Go modules.
 To reduce our maintenance cost we are deprecating License Compliance for Godep projects as of 14.7
 and will remove it in GitLab 15.0
 
-Planned removal milestone: 15.0 (2022-06-22)
+Planned removal milestone: 15.0 (2022-05-22)
 
 ### Logging in GitLab
 
@@ -335,7 +335,7 @@ can cause production issues with large databases,
 and can interfere with object storage development.
 It is now considered deprecated, and will be removed in GitLab 15.0.
 
-Planned removal milestone: 15.0 (2021-06-22)
+Planned removal milestone: 15.0 (2021-05-22)
 
 ### Removal of Static Site Editor
 
@@ -343,14 +343,6 @@ The Static Site Editor will no longer be available starting in GitLab 15.0. Impr
 
 Planned removal milestone: 15.0 (2022-05-22)
 
-### Tracing in GitLab
-
-Tracing in GitLab is an integration with Jaeger, an open-source end-to-end distributed tracing system. GitLab users can navigate to their Jaeger instance to gain insight into the performance of a deployed application, tracking each function or microservice that handles a given request. Tracing in GitLab is deprecated in GitLab 14.7, and scheduled for removal in 15.0. To track work on a possible replacement, see the issue for [Opstrace integration with GitLab](https://gitlab.com/groups/gitlab-org/-/epics/6976).
-
-Planned removal milestone: 15.0 (2022-05-22)
-
-## 14.8
-
 ### Removal of `artifacts:report:cobertura` keyword
 
 Currently, test coverage visualizations in GitLab only support Cobertura reports. Starting 15.0, the
@@ -358,4 +350,10 @@ Currently, test coverage visualizations in GitLab only support Cobertura reports
 [`artifacts:reports:coverage_report`](https://gitlab.com/gitlab-org/gitlab/-/issues/344533). Cobertura will be the
 only supported report file in 15.0, but this is the first step towards GitLab supporting other report types.
 
-Planned removal milestone: 15.0 (2022-06-22)
+Planned removal milestone: 15.0 (2022-05-22)
+
+### Tracing in GitLab
+
+Tracing in GitLab is an integration with Jaeger, an open-source end-to-end distributed tracing system. GitLab users can navigate to their Jaeger instance to gain insight into the performance of a deployed application, tracking each function or microservice that handles a given request. Tracing in GitLab is deprecated in GitLab 14.7, and scheduled for removal in 15.0. To track work on a possible replacement, see the issue for [Opstrace integration with GitLab](https://gitlab.com/groups/gitlab-org/-/epics/6976).
+
+Planned removal milestone: 15.0 (2022-05-22)