From d41e69a6527fd42d0c17ac4f5a0ecb81d00837ca Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Thu, 30 Mar 2023 10:14:07 -0500
Subject: [PATCH 1/2] 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 2e63cb0fa6..7a05d17827 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:
  * Save host id to system.local and flush immediately after startup (CASSANDRA-18153)

From 83dd275d5d824abba4ced3cfbdada711f2e7bf63 Mon Sep 17 00:00:00 2001
From: Lorina Poland <lorinapoland@gmail.com>
Date: Tue, 14 Feb 2023 10:53:29 -0800
Subject: [PATCH 2/2] DOC - Added :stem: latexmath to Data Modeling page to fix
 display of equations

patch by Lorina Poland; reviewed by Erick Ramirez for CASSANDRA-16906
---
 .../cassandra/pages/data_modeling/data_modeling_refining.adoc    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/modules/cassandra/pages/data_modeling/data_modeling_refining.adoc b/doc/modules/cassandra/pages/data_modeling/data_modeling_refining.adoc
index 09f16da094..045a80c4fd 100644
--- a/doc/modules/cassandra/pages/data_modeling/data_modeling_refining.adoc
+++ b/doc/modules/cassandra/pages/data_modeling/data_modeling_refining.adoc
@@ -1,4 +1,5 @@
 = Evaluating and Refining Data Models
+:stem: latexmath
 
 Once you’ve created a physical model, there are some steps you’ll want
 to take to evaluate and refine table designs to help ensure optimal