Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Brandon Williams 2021-03-04 08:14:57 -06:00
commit 995ce0ee21
3 changed files with 2 additions and 1 deletions

View File

@ -27,6 +27,7 @@
* Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, in the cassandra-all pom (CASSANDRA-16303)
* Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
Merged from 3.11:
* Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462)
* Fix digest computation for queries with fetched but non queried columns (CASSANDRA-15962)
* Reduce amount of allocations during batch statement execution (CASSANDRA-16201)
* Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)

View File

@ -582,7 +582,7 @@
<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.4"/>
<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.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>