Merge branch 'cassandra-4.0' into trunk

ekaterinadimitrova2 · Sep 17, 2021 · 4c5d33a · 4c5d33a
2 parents 7faff38 + 66a1f9b
commit 4c5d33a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -34,6 +34,7 @@ Merged from 4.0:
  * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
  * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
 Merged from 3.11:
+ * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
  * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 Merged from 3.0:
  * Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564)

diff --git a/build.xml b/build.xml
@@ -516,10 +516,10 @@
           <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.datatype" artifactId="jackson-datatype-jsr310" version="2.9.10"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.12.5"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.12.5"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.12.5"/>
+          <dependency groupId="com.fasterxml.jackson.datatype" artifactId="jackson-datatype-jsr310" version="2.12.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
@@ -42,6 +42,7 @@ public class Json
      */
     public static String quoteAsJsonString(String s)
     {
+        // In future should update to directly use `JsonStringEncoder.getInstance()` but for now:
         return new String(BufferRecyclers.getJsonStringEncoder().quoteAsString(s));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ public class Json @@
          */
         public static String quoteAsJsonString(String s)
         {
+            // In future should update to directly use `JsonStringEncoder.getInstance()` but for now:
             return new String(BufferRecyclers.getJsonStringEncoder().quoteAsString(s));
         }
@@ Expand Down @@