Merge branch 'cassandra-4.1' into trunk

* cassandra-4.1:
  Moved jflex from runtime to build dependencies
This commit is contained in:
Jacek Lewandowski 2023-07-13 15:33:12 +02:00
commit 0910901d7b
3 changed files with 5 additions and 4 deletions

View File

@ -127,5 +127,9 @@
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
</dependency>
<dependency>
<groupId>de.jflex</groupId>
<artifactId>jflex</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -324,10 +324,6 @@
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
</dependency>
<dependency>
<groupId>de.jflex</groupId>
<artifactId>jflex</artifactId>
</dependency>
<dependency>
<groupId>com.github.rholder</groupId>
<artifactId>snowball-stemmer</artifactId>

View File

@ -166,6 +166,7 @@ Merged from 4.0:
* Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
* Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
Merged from 3.11:
* Moved jflex from runtime to build dependencies (CASSANDRA-18664)
* Fix CAST function for float to decimal (CASSANDRA-18647)
* Suppress CVE-2022-45688 (CASSANDRA-18643)
* Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204)