From 22a308567d668ff0198dd6fb380191cdd59f212b Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 12 Aug 2021 15:00:22 -0700
Subject: [PATCH 1/3] CASSANDRA-16462: upgrade Jackson 2.9->2.10

---
 build.xml                                    | 6 +++---
 src/java/org/apache/cassandra/cql3/Json.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 99fc92c59d07..f097056bf5c1 100644
--- a/build.xml
+++ b/build.xml
@@ -516,9 +516,9 @@
           <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" />
           <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.3"/>
           <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.3"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.9.10"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.9.10.8"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.9.10"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.10.5"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.10.5.1"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.10.5"/>
           <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
           <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
           <dependency groupId="com.github.jbellis" artifactId="jamm" version="${jamm.version}"/>
diff --git a/src/java/org/apache/cassandra/cql3/Json.java b/src/java/org/apache/cassandra/cql3/Json.java
index ea0a49ccba0b..ce52f5f98fc3 100644
--- a/src/java/org/apache/cassandra/cql3/Json.java
+++ b/src/java/org/apache/cassandra/cql3/Json.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.util.*;
 
-import com.fasterxml.jackson.core.util.BufferRecyclers;
+import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.cassandra.schema.ColumnMetadata;
 import org.apache.cassandra.schema.TableMetadata;
@@ -42,7 +42,7 @@ public class Json
      */
     public static String quoteAsJsonString(String s)
     {
-        return new String(BufferRecyclers.getJsonStringEncoder().quoteAsString(s));
+        return new String(JsonStringEncoder.getInstance().quoteAsString(s));
     }
 
     public static Object decodeJson(String json)

From f50fbc232e8711bc76bf5398a52e705d18d814e8 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 13 Aug 2021 09:31:38 -0700
Subject: [PATCH 2/3] Update Jackson jars to 2.12.4 (instead of initial 2.10.5)

---
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index f097056bf5c1..41dffa12bcb6 100644
--- a/build.xml
+++ b/build.xml
@@ -516,9 +516,9 @@
           <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" />
           <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.3"/>
           <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.3"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.10.5"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.10.5.1"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.10.5"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.12.4"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.12.4"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.12.4"/>
           <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
           <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
           <dependency groupId="com.github.jbellis" artifactId="jamm" version="${jamm.version}"/>

From 3c7b372acf8e0ac3af464549371d950215fc0120 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 30 Aug 2021 10:19:13 -0700
Subject: [PATCH 3/3] CASSANDRA-16851: revert change wrt JsonStringEncoder to
 minimize diff

---
 src/java/org/apache/cassandra/cql3/Json.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/cassandra/cql3/Json.java b/src/java/org/apache/cassandra/cql3/Json.java
index ce52f5f98fc3..d05096a39749 100644
--- a/src/java/org/apache/cassandra/cql3/Json.java
+++ b/src/java/org/apache/cassandra/cql3/Json.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.util.*;
 
-import com.fasterxml.jackson.core.io.JsonStringEncoder;
+import com.fasterxml.jackson.core.util.BufferRecyclers;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.cassandra.schema.ColumnMetadata;
 import org.apache.cassandra.schema.TableMetadata;
@@ -42,7 +42,8 @@ public class Json
      */
     public static String quoteAsJsonString(String s)
     {
-        return new String(JsonStringEncoder.getInstance().quoteAsString(s));
+        // In future should update to directly use `JsonStringEncoder.getInstance()` but for now:
+        return new String(BufferRecyclers.getJsonStringEncoder().quoteAsString(s));
     }
 
     public static Object decodeJson(String json)