From dbaaa9ebb928241c05d6874e942f47764fcc8c57 Mon Sep 17 00:00:00 2001
From: Mario Lenz <m@riolenz.de>
Date: Fri, 23 Jun 2023 18:02:02 +0200
Subject: [PATCH] Keep service.now in 8.x

---
 8/ansible-8.build          | 1 +
 8/ansible.in               | 1 +
 8/changelog.yaml           | 4 ++--
 8/galaxy-requirements.yaml | 3 +++
 9/changelog.yaml           | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/8/ansible-8.build b/8/ansible-8.build
index 0ec09e4dc8..cdaac68c0c 100644
--- a/8/ansible-8.build
+++ b/8/ansible-8.build
@@ -99,6 +99,7 @@ purestorage.flasharray: >=1.18.0,<2.0.0
 purestorage.flashblade: >=1.11.0,<2.0.0
 purestorage.fusion: >=1.4.0,<2.0.0
 sensu.sensu_go: >=1.13.0,<2.0.0
+servicenow.servicenow: >=1.0.0,<2.0.0
 splunk.es: >=2.1.0,<3.0.0
 t_systems_mms.icinga_director: >=1.32.0,<2.0.0
 theforeman.foreman: >=3.10.0,<4.0.0
diff --git a/8/ansible.in b/8/ansible.in
index 915638fc23..8ca031cf87 100644
--- a/8/ansible.in
+++ b/8/ansible.in
@@ -96,6 +96,7 @@ purestorage.flasharray
 purestorage.flashblade
 purestorage.fusion
 sensu.sensu_go
+servicenow.servicenow
 splunk.es
 theforeman.foreman
 t_systems_mms.icinga_director
diff --git a/8/changelog.yaml b/8/changelog.yaml
index 3efac2ebd7..aa3de23913 100644
--- a/8/changelog.yaml
+++ b/8/changelog.yaml
@@ -97,6 +97,6 @@ releases:
     release_date: '2023-06-22'
   8.2.0:
     changes:
-      removed_features:
-      - The deprecated servicenow.servicenow collection has been removed from Ansible 7, but accidentally re-added to Ansible 8. It has been removed again from Ansible 8.2.0
+      deprecated_features:
+      - The deprecated servicenow.servicenow collection has been removed from Ansible 7, but accidentally re-added to Ansible 8. It will be removed again from Ansible 9.
         (https://github.com/ansible-community/community-topics/issues/246).
diff --git a/8/galaxy-requirements.yaml b/8/galaxy-requirements.yaml
index cdd693f4ec..611572bb2a 100644
--- a/8/galaxy-requirements.yaml
+++ b/8/galaxy-requirements.yaml
@@ -294,6 +294,9 @@ collections:
 - name: sensu.sensu_go
   source: https://galaxy.ansible.com
   version: 1.13.2
+- name: servicenow.servicenow
+  source: https://galaxy.ansible.com
+  version: 1.0.6
 - name: splunk.es
   source: https://galaxy.ansible.com
   version: 2.1.0
diff --git a/9/changelog.yaml b/9/changelog.yaml
index b7f482255c..c6d0c64dc5 100644
--- a/9/changelog.yaml
+++ b/9/changelog.yaml
@@ -15,3 +15,5 @@ releases:
         - "``community.skydive`` was considered unmaintained and removed from Ansible 9 as per the
           `removal from Ansible process <https://github.com/ansible-collections/overview/blob/main/removal_from_ansible.rst#unmaintained-collections>`_.
           Users can still install this collection with ``ansible-galaxy collection install community.skydive``."
+        - The deprecated servicenow.servicenow collection has been removed from Ansible 7, but accidentally re-added to Ansible 8. It has been removed again from Ansible 9.
+          (https://github.com/ansible-community/community-topics/issues/246).