From 24f5b64f2616daa3a3dabe34deb7fd6ebfc43429 Mon Sep 17 00:00:00 2001
From: Maxim Muzafarov <maxmuzaf@gmail.com>
Date: Wed, 29 Mar 2023 06:24:34 -0500
Subject: [PATCH 1/3] Notify the corresponding JIRA issue as soon as the PR is
 raised

Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18372
---
 .asf.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000000..c701eeec8c
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,8 @@
+github:
+  enabled_merge_buttons:
+    squash:  false
+    merge:   false
+    rebase:  true
+
+notifications:
+  jira_options: link worklog

From 20bf2273a0b5024a78b9564d2f23536cf18650a5 Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Wed, 29 Mar 2023 06:32:05 -0500
Subject: [PATCH 2/3] Remove asf.yaml from non-trunk branches

---
 .asf.yaml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
deleted file mode 100644
index c701eeec8c..0000000000
--- a/.asf.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-github:
-  enabled_merge_buttons:
-    squash:  false
-    merge:   false
-    rebase:  true
-
-notifications:
-  jira_options: link worklog

From f9364e4f44b0d37905713a76d088218645ab72fb Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Thu, 30 Mar 2023 10:14:07 -0500
Subject: [PATCH 3/3] Suppress CVE-2022-45688

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18389
---
 .build/dependency-check-suppressions.xml | 5 +++++
 CHANGES.txt                              | 1 +
 2 files changed, 6 insertions(+)

diff --git a/.build/dependency-check-suppressions.xml b/.build/dependency-check-suppressions.xml
index b0603e3f90..68c97bb777 100644
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@ -114,5 +114,10 @@
         <cve>CVE-2022-42003</cve>
         <cve>CVE-2022-42004</cve>
     </suppress>
+    <!-- https://issues.apache.org/jira/browse/CASSANDRA-18389 -->
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core.*$</packageUrl>
+        <cve>CVE-2022-45688</cve>
+    </suppress>
 
 </suppressions>
diff --git a/CHANGES.txt b/CHANGES.txt
index f38ce34b95..8b61cdad82 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.15
+ * Suppress CVE-2022-45688 (CASSANDRA-18389)
  * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
 Merged from 3.0:
  * Fix RepairJob unnecessarily reporting cancellation error (CASSANDRA-17701)