diff --git a/CHANGES.txt b/CHANGES.txt
index 0690b0ea9e..86f4b5c758 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.16
+ * 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)
@@ -20,6 +21,7 @@ Merged from 3.0:
* Validate the existence of a datacenter in nodetool rebuild (CASSANDRA-14319)
* Suppress CVE-2023-2251 (CASSANDRA-18497)
+
3.11.15
* Fix the capital P usage in the CQL parser (CASSANDRA-17919)
* Fix sstable_count metric missing from tablestats json/yaml output (CASSANDRA-18448)
@@ -190,6 +192,7 @@ Merged from 2.2:
* Fix centos packaging for arm64, >=4.0 rpm's now require python3 (CASSANDRA-16477)
* Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
+
3.11.10
* Fix digest computation for queries with fetched but non queried columns (CASSANDRA-15962)
* Reduce amount of allocations during batch statement execution (CASSANDRA-16201)
@@ -216,6 +219,7 @@ Merged from 3.0:
Merged from 2.2:
* Fix the histogram merge of the table metrics (CASSANDRA-16259)
+
3.11.9
* Synchronize Keyspace instance store/clear (CASSANDRA-16210)
* Fix ColumnFilter to avoid querying cells of unselected complex columns (CASSANDRA-15977)
@@ -233,6 +237,7 @@ Merged from 2.2:
* Package tools/bin scripts as executable (CASSANDRA-16151)
* Fixed a NullPointerException when calling nodetool enablethrift (CASSANDRA-16127)
+
3.11.8
* Correctly interpret SASI's `max_compaction_flush_memory_in_mb` setting in megabytes not bytes (CASSANDRA-16071)
* Fix short read protection for GROUP BY queries (CASSANDRA-15459)
@@ -253,6 +258,7 @@ Merged from 2.2:
Merged from 2.1:
* Only allow strings to be passed to JMX authentication (CASSANDRA-16077)
+
3.11.7
* Fix cqlsh output when fetching all rows in batch mode (CASSANDRA-15905)
* Upgrade Jackson to 2.9.10 (CASSANDRA-15867)
@@ -1493,7 +1499,6 @@ Merged from 2.1:
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-8708)
-
3.2
* Make sure tokens don't exist in several data directories (CASSANDRA-6696)
* Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)
@@ -6526,7 +6531,6 @@ Merged from 0.8:
- Similarly, merged batch_insert_super into batch_insert.
-
0.4.0 beta
* On-disk data format has changed to allow billions of keys/rows per
node instead of only millions
@@ -6563,7 +6567,6 @@ Merged from 0.8:
* Rename configuration "table" to "keyspace"
* Moved to crash-only design; no more shutdown (just kill the process)
* Lots of bug fixes
-
Full list of issues resolved in 0.4 is at https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&&pid=12310865&fixfor=12313862&resolution=1&sorter/field=issuekey&sorter/order=DESC
@@ -6594,3 +6597,5 @@ Full list of issues resolved in 0.4 is at https://issues.apache.org/jira/secure/
* Combined blocking and non-blocking versions of insert APIs
* Added FlushPeriodInMinutes configuration parameter to force
flushing of infrequently-updated ColumnFamilies
+
+
diff --git a/build.xml b/build.xml
index 8f26c5e8f2..30af43ac4d 100644
--- a/build.xml
+++ b/build.xml
@@ -623,7 +623,6 @@
-