natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Ekaterina Dimitrova 2021-09-17 17:26:07 -04:00
parent dd3d83a819 e4d2802276
commit 14af149ed5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900)
* 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)

6
build.xml
View File

@ -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.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.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}"/>

1
src/java/org/apache/cassandra/cql3/Json.java
View File

@ -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));
}