This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 3dd2665f12a81f55f82eddb5f054b39ca94140c9
Merge: 53d1644ff4 d850cd7372
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue Aug 8 10:28:16 2023 -0500

    Merge branch 'cassandra-4.1' into cassandra-5.0

 .build/dependency-check-suppressions.xml | 52 --------------------------------
 CHANGES.txt                              |  3 ++
 2 files changed, 3 insertions(+), 52 deletions(-)

diff --cc .build/dependency-check-suppressions.xml
index d7a66cb3bf,b7ebb45e57..6c2e52c3ca
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@@ -44,42 -35,26 +35,6 @@@
          <cve>CVE-2021-4235</cve>
          <cve>CVE-2017-18640</cve>
      </suppress>
-     <suppress>
-         <!-- dependency checker identified this as a completely different 
package (wire) -->
-         <packageUrl 
regex="true">^pkg:maven/net\.openhft/chronicle\-wire@.*$</packageUrl>
-         <cpe>cpe:/a:wire:wire</cpe>
-     </suppress>
-     <!-- https://issues.apache.org/jira/browse/CASSANDRA-18146 -->
-     <suppress>
-         <packageUrl 
regex="true">^pkg:maven/org\.apache\.commons.*$</packageUrl>
-         <cve>CVE-2021-37533</cve>
-     </suppress>
-     <suppress>
-         <packageUrl regex="true">^pkg:maven/commons-io/.*$</packageUrl>
-         <cve>CVE-2021-37533</cve>
-     </suppress>
-     <suppress>
-         <packageUrl regex="true">^pkg:maven/commons-cli/.*$</packageUrl>
-         <cve>CVE-2021-37533</cve>
-     </suppress>
--    <suppress>
-         <packageUrl regex="true">^pkg:maven/commons-codec/.*$</packageUrl>
-         <cve>CVE-2021-37533</cve>
 -        <!-- not applicable https://nvd.nist.gov/vuln/detail/CVE-2020-8908 -->
 -        <packageUrl 
regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
 -        <cve>CVE-2020-8908</cve>
 -        <cve>CVE-2023-2976</cve>
--    </suppress>
--    <!-- netty's http stuff is not applicable here -->
--    <suppress>
--        <packageUrl 
regex="true">^pkg:maven/io\.netty/netty\-all@.*$</packageUrl>
--        <cve>CVE-2021-21290</cve>
--        <cve>CVE-2021-21295</cve>
--        <cve>CVE-2021-21409</cve>
--        <cve>CVE-2021-37136</cve>
--        <cve>CVE-2021-37137</cve>
--        <cve>CVE-2021-43797</cve>
--        <cve>CVE-2022-24823</cve>
--        <cve>CVE-2022-41881</cve>
--        <cve>CVE-2022-41915</cve>
--        <cve>CVE-2023-34462</cve>
--    </suppress>
      <!-- https://issues.apache.org/jira/browse/CASSANDRA-17966 -->
      <suppress>
          <packageUrl 
regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
@@@ -87,11 -62,5 +42,4 @@@
          <cve>CVE-2022-42004</cve>
          <cve>CVE-2023-35116</cve>
      </suppress>
- 
-     <!-- https://issues.apache.org/jira/browse/CASSANDRA-18643 -->
-     <suppress>
-         <packageUrl 
regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$</packageUrl>
-         <cve>CVE-2022-45688</cve>
-     </suppress>
--
  </suppressions>
diff --cc CHANGES.txt
index 921ad41f4d,0f33ba0e2e..278b93387d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,186 -1,5 +1,189 @@@
 -4.1.4
 +5.0
 + * Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992)
 + * Fix for (unsupported) big endian unaligned architecture, eg s390x 
(CASSANDRA-17723)
 + * CIDR filtering authorizer (CASSANDRA-18592)
 + * Remove 3.x from the versions checked for prepared statement behaviour 
(CASSANDRA-18695)
 + * Add vector similarity functions (CASSANDRA-18640)
 + * Lift MessagingService.minimum_version to 40 (CASSANDRA-18314)
 + * Introduce pluggable crypto providers and default to 
AmazonCorrettoCryptoProvider (CASSANDRA-18624)
 + * Improved DeletionTime serialization (CASSANDRA-18648)
 + * CEP-7: Storage Attached Indexes (CASSANDRA-16052)
 + * Add equals/hashCode override for ServerEncryptionOptions (CASSANDRA-18428)
 + * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190)
 + * Fix ClassCastException  from jdk GaloisCounterMode when using JDK17 
provider (CASSANDRA-18180)
 + * Drop JDK8, add JDK17 (CASSANDRA-18255)
 + * Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics 
(CASSANDRA-18298)
 + * Upgrade Jamm version to 0.4.0  (CASSANDRA-17884, CASSANDRA-16304, 
CASSANDRA-18329)
 + * Remove legacy 3.0/3.11 buffer pool metrics (CASSANDRA-18313)
 + * Add AzureSnitch (CASSANDRA-18646)
 + * Implementation of the Unified Compaction Strategy as described in CEP-26 
(CASSANDRA-18397)
 + * Upgrade commons cli to 1.5.0 (CASSANDRA-18659)
 + * Disable the deprecated keyspace/table thresholds and convert them to 
guardrails (CASSANDRA-18617)
 + * Deprecate CloudstackSnitch and remove duplicate code in snitches 
(CASSANDRA-18438)
 + * Add support for vectors in UDFs (CASSANDRA-18613)
 + * Improve vector value validation errors (CASSANDRA-18652)
 + * Upgrade Guava to 32.0.1 (CASSANDRA-18645)
 + * Add duration and count of partition keys to sstablemetadata 
(CASSANDRA-18639)
 + * Remove deprecated compaction_tombstone_warning_threshold and 
compaction_large_partition_warning_threshold from yaml (CASSANDRA-18626)
 + * Enhance nodetool compactionstats with additional metrics (CASSANDRA-18305)
 + * Added support for type VECTOR<type, dimension> (CASSANDRA-18504)
 + * Expose bootstrap and decommission state to nodetool info (CASSANDRA-18555)
 + * Fix SSTabledump errors when dumping data from index (CASSANDRA-17698)
 + * Avoid unnecessary deserialization of terminal arguments when executing CQL 
functions (CASSANDRA-18566)
 + * Remove dependency on pytz library for setting CQLSH timezones on Python 
version >= 3.9 (CASSANDRA-17433)
 + * Extend maximum expiration date (CASSANDRA-14227)
 + * Add guardrail for partition tombstones and deprecate 
compaction_tombstone_warning_threshold (CASSANDRA-17194)
 + * Print header and statistics for cassandra-stress output with arbitrary 
frequency (CASSANDRA-12972)
 + * CEP-25: Trie-indexed SSTable format (CASSANDRA-18398)
 + * Make cassandra-stress able to read all credentials from a file 
(CASSANDRA-18544)
 + * Add guardrail for partition size and deprecate 
compaction_large_partition_warning_threshold (CASSANDRA-18500)
 + * Add HISTORY command for CQLSH (CASSANDRA-15046)
 + * Fix sstable formats configuration (CASSANDRA-18441)
 + * Add guardrail to bound timestamps (CASSANDRA-18352)
 + * Add keyspace_name column to system_views.clients (CASSANDRA-18525)
 + * Moved system properties and envs to CassandraRelevantProperties and 
CassandraRelevantEnv respectively (CASSANDRA-17797)
 + * Add sstablepartitions offline tool to find large partitions in sstables 
(CASSANDRA-8720)
 + * Replace usages of json-simple dependency by Jackson (CASSANDRA-16855)
 + * When decommissioning should set Severity to limit traffic (CASSANDRA-18430)
 + * For Java11 and Java17 remove -XX:-UseBiasedLocking as it is the default 
already (CASSANDRA-17869)
 + * Upgrade commons-io to 2.11.0 (CASSANDRA-17364)
 + * Node Draining Should Abort All Current SSTables Imports (CASSANDRA-18373)
 + * Use snake case for the names of CQL native functions (CASSANDRA-18037)
 + * Use jdk-dependent checkstyle version to check the source code 
(CASSANDRA-18262)
 + * Provide summary of failed SessionInfo's in StreamResultFuture 
(CASSANDRA-17199)
 + * CEP-20: Dynamic Data Masking (CASSANDRA-17940)
 + * Add system_views.snapshots virtual table (CASSANDRA-18102)
 + * Update OpenHFT dependencies (chronicle-queue, chronicle-core, 
chronicle-bytes, chronicle-wire, chronicle-threads) (CASSANDRA-18049)
 + * Remove org.apache.cassandra.hadoop code (CASSANDRA-18323)
 + * Remove deprecated CQL functions dateOf and unixTimestampOf 
(CASSANDRA-18328)
 + * Remove DateTieredCompactionStrategy (CASSANDRA-18043)
 + * Add system_views.max_sstable_size and system_views.max_sstable_duration 
tables (CASSANDRA-18333)
 + * Extend implicit allow-filtering for virtual tables to clustering columns 
(CASSANDRA-18331)
 + * Upgrade maven-shade-plugin to 3.4.1 to fix shaded dtest JAR build 
(CASSANDRA-18136)
 + * Upgrade to Opcodes.ASM9 (CASSANDRA-17971)
 + * Add MaxSSTableSize and MaxSSTableDuration metrics and propagate them 
together with local read/write ratio to tablestats (CASSANDRA-18283)
 + * Add more logging around CompactionManager operations (CASSANDRA-18268)
 + * Reduce memory allocations of calls to ByteBufer.duplicate() made in 
org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212)
 + * CEP-17: SSTable API (CASSANDRA-17056)
 + * Gossip stateMapOrdering does not have correct ordering when both 
EndpointState are in the bootstrapping set (CASSANDRA-18292)
 + * Snapshot only sstables containing mismatching ranges on preview repair 
mismatch (CASSANDRA-17561)
 + * More accurate skipping of sstables in read path (CASSANDRA-18134)
 + * Prepare for JDK17 experimental support (CASSANDRA-18179, CASSANDRA-18258)
 + * Remove Scripted UDFs internals; hooks to be added later in CASSANDRA-17281 
(CASSANDRA-18252)
 + * Update JNA to 5.13.0 (CASSANDRA-18050)
 + * Make virtual tables decide if they implicitly enable ALLOW FILTERING 
(CASSANDRA-18238)
 + * Add row, tombstone, and sstable count to nodetool profileload 
(CASSANDRA-18022)
 + * Coordinator level metrics for read response and mutation row and column 
counts (CASSANDRA-18155)
 + * Add CQL functions for dynamic data masking (CASSANDRA-17941)
 + * Print friendly error when nodetool attempts to connect to uninitialized 
server (CASSANDRA-11537)
 + * Use G1GC by default, and update default G1GC settings (CASSANDRA-18027)
 + * SimpleSeedProvider can resolve multiple IP addresses per DNS record 
(CASSANDRA-14361)
 + * Remove mocking in InternalNodeProbe spying on StorageServiceMBean 
(CASSANDRA-18152)
 + * Add compaction_properties column to system.compaction_history table and 
nodetool compactionhistory command (CASSANDRA-18061)
 + * Remove ProtocolVersion entirely from the CollectionSerializer ecosystem 
(CASSANDRA-18114)
 + * Fix serialization error in new getsstables --show-levels option 
(CASSANDRA-18140)
 + * Use checked casts when reading vints as ints (CASSANDRA-18099)
 + * Add Mutation Serialization Caching (CASSANDRA-17998)
 + * Only reload compaction strategies if disk boundaries change 
(CASSANDRA-17874)
 + * CEP-10: Simulator Java11 Support (CASSANDRA-17178)
 + * Set the major compaction type correctly for compactionstats 
(CASSANDRA-18055)
 + * Print exception message without stacktrace when nodetool commands fail on 
probe.getOwnershipWithPort() (CASSANDRA-18079)
 + * Add option to print level in nodetool getsstables output (CASSANDRA-18023)
 + * Implement a guardrail for not having zero default_time_to_live on tables 
with TWCS (CASSANDRA-18042)
 + * Add CQL scalar functions for collection aggregation (CASSANDRA-18060)
 + * Make cassandra.replayList property for CommitLogReplayer possible to react 
on keyspaces only (CASSANDRA-18044)
 + * Add Mathematical functions (CASSANDRA-17221)
 + * Make incremental backup configurable per table (CASSANDRA-15402)
 + * Change shebangs of Python scripts to resolve Python 3 from env command 
(CASSANDRA-17832)
 + * Add reasons to guardrail messages and consider guardrails in the error 
message for needed ALLOW FILTERING (CASSANDRA-17967)
 + * Add support for CQL functions on collections, tuples and UDTs 
(CASSANDRA-17811)
 + * Add flag to exclude nodes from local DC when running nodetool rebuild 
(CASSANDRA-17870)
 + * Adding endpoint verification option to client_encryption_options 
(CASSANDRA-18034)
 + * Replace 'wcwidth.py' with pypi module (CASSANDRA-17287)
 + * Add nodetool forcecompact to remove tombstoned or ttl'd data ignoring GC 
grace for given table and partition keys (CASSANDRA-17711)
 + * Offer IF (NOT) EXISTS in cqlsh completion for CREATE TYPE, DROP TYPE, 
CREATE ROLE and DROP ROLE (CASSANDRA-16640)
 + * Nodetool bootstrap resume will now return an error if the operation fails 
(CASSANDRA-16491)
 + * Disable resumable bootstrap by default (CASSANDRA-17679)
 + * Include Git SHA in --verbose flag for nodetool version (CASSANDRA-17753)
 + * Update Byteman to 4.0.20 and Jacoco to 0.8.8 (CASSANDRA-16413)
 + * Add memtable option among possible tab completions for a table 
(CASSANDRA-17982)
 + * Adds a trie-based memtable implementation (CASSANDRA-17240)
 + * Further improves precision of memtable heap tracking (CASSANDRA-17240)
 + * Fix formatting of metrics documentation (CASSANDRA-17961)
 + * Keep sstable level when streaming for decommission and move 
(CASSANDRA-17969)
 + * Add Unavailables metric for CASWrite in the docs (CASSANDRA-16357)
 + * Make Cassandra logs able to be viewed in the virtual table 
system_views.system_logs (CASSANDRA-17946)
 + * IllegalArgumentException in Gossiper#order due to concurrent mutations to 
elements being applied (CASSANDRA-17908)
 + * Include estimated active compaction remaining write size when starting a 
new compaction (CASSANDRA-17931)
 + * Mixed mode support for internode authentication during TLS upgrades 
(CASSANDRA-17923)
 + * Revert Mockito downgrade from CASSANDRA-17750 (CASSANDRA-17496)
 + * Add --older-than and --older-than-timestamp options for nodetool 
clearsnapshots (CASSANDRA-16860)
 + * Fix "open RT bound as its last item" exception (CASSANDRA-17810)
 + * Fix leak of non-standard Java types in JMX MBeans 
`org.apache.cassandra.db:type=StorageService`
 +   and `org.apache.cassandra.db:type=RepairService` as clients using JMX 
cannot handle them. More details in NEWS.txt (CASSANDRA-17668)
 + * Deprecate Throwables.propagate usage (CASSANDRA-14218)
 + * Allow disabling hotness persistence for high sstable counts 
(CASSANDRA-17868)
 + * Prevent NullPointerException when changing neverPurgeTombstones from true 
to false (CASSANDRA-17897)
 + * Add metrics around storage usage and compression (CASSANDRA-17898)
 + * Remove usage of deprecated javax certificate classes (CASSANDRA-17867)
 + * Make sure preview repairs don't optimise streams unless configured to 
(CASSANDRA-17865)
 + * Optionally avoid hint transfer during decommission (CASSANDRA-17808)
 + * Make disabling auto snapshot on selected tables possible (CASSANDRA-10383)
 + * Introduce compaction priorities to prevent upgrade compaction inability to 
finish (CASSANDRA-17851)
 + * Prevent a user from manually removing ephemeral snapshots (CASSANDRA-17757)
 + * Remove dependency on Maven Ant Tasks (CASSANDRA-17750)
 + * Update ASM(9.1 to 9.3), Mockito(1.10.10 to 1.12.13) and ByteBuddy(3.2.4 to 
4.7.0) (CASSANDRA-17835)
 + * Add the ability for operators to loosen the definition of "empty" for edge 
cases (CASSANDRA-17842)
 + * Fix potential out of range exception on column index downsampling 
(CASSANDRA-17839)
 + * Introduce target directory to vtable output for sstable_tasks and for 
compactionstats (CASSANDRA-13010)
 + * Read/Write/Truncate throw RequestFailure in a race condition with callback 
timeouts, should return Timeout instead (CASSANDRA-17828)
 + * Add ability to log load profiles at fixed intervals (CASSANDRA-17821)
 + * Protect against Gossip backing up due to a quarantined endpoint without 
version information (CASSANDRA-17830)
 + * NPE in org.apache.cassandra.cql3.Attributes.getTimeToLive (CASSANDRA-17822)
 + * Add guardrail for column size (CASSANDRA-17151)
 + * When doing a host replacement, we need to check that the node is a live 
node before failing with "Cannot replace a live node..." (CASSANDRA-17805)
 + * Add support to generate a One-Shot heap dump on unhandled exceptions 
(CASSANDRA-17795)
 + * Rate-limit new client connection auth setup to avoid overwhelming bcrypt 
(CASSANDRA-17812)
 + * DataOutputBuffer#scratchBuffer can use off-heap or on-heap memory as a 
means to control memory allocations (CASSANDRA-16471)
 + * Add ability to read the TTLs and write times of the elements of a 
collection and/or UDT (CASSANDRA-8877)
 + * Removed Python < 2.7 support from formatting.py (CASSANDRA-17694)
 + * Cleanup pylint issues with pylexotron.py (CASSANDRA-17779)
 + * NPE bug in streaming checking if SSTable is being repaired 
(CASSANDRA-17801)
 + * Users of NativeLibrary should handle lack of JNA appropriately when 
running in client mode (CASSANDRA-17794)
 + * Warn on unknown directories found in system keyspace directory rather than 
kill node during startup checks (CASSANDRA-17777)
 + * Log duplicate rows sharing a partition key found in verify and scrub 
(CASSANDRA-17789)
 + * Add separate thread pool for Secondary Index building so it doesn't block 
compactions (CASSANDRA-17781)
 + * Added JMX call to getSSTableCountPerTWCSBucket for TWCS (CASSANDRA-17774)
 + * When doing a host replacement, -Dcassandra.broadcast_interval_ms is used 
to know when to check the ring but checks that the ring wasn't changed in 
-Dcassandra.ring_delay_ms, changes to ring delay should not depend on when we 
publish load stats (CASSANDRA-17776)
 + * When bootstrap fails, CassandraRoleManager may attempt to do read queries 
that fail with "Cannot read from a bootstrapping node", and increments 
unavailables counters (CASSANDRA-17754)
 + * Add guardrail to disallow DROP KEYSPACE commands (CASSANDRA-17767)
 + * Remove ephemeral snapshot marker file and introduce a flag to 
SnapshotManifest (CASSANDRA-16911)
 + * Add a virtual table that exposes currently running queries 
(CASSANDRA-15241)
 + * Allow sstableloader to specify table without relying on path 
(CASSANDRA-16584)
 + * Fix 
TestGossipingPropertyFileSnitch.test_prefer_local_reconnect_on_listen_address 
(CASSANDRA-17700)
 + * Add ByteComparable API (CASSANDRA-6936)
 + * Add guardrail for maximum replication factor (CASSANDRA-17500)
 + * Increment CQLSH to version 6.2.0 for release 4.2 (CASSANDRA-17646)
 + * Adding support to perform certificate based internode authentication 
(CASSANDRA-17661)
 + * Option to disable CDC writes of repaired data (CASSANDRA-17666)
 + * When a node is bootstrapping it gets the whole gossip state but applies in 
random order causing some cases where StorageService will fail causing an 
instance to not show up in TokenMetadata (CASSANDRA-17676)
 + * Add CQLSH command SHOW REPLICAS (CASSANDRA-17577)
 + * Add guardrail to allow disabling of SimpleStrategy (CASSANDRA-17647)
 + * Change default directory permission to 750 in packaging (CASSANDRA-17470)
 + * Adding support for TLS client authentication for internode communication 
(CASSANDRA-17513)
 + * Add new CQL function maxWritetime (CASSANDRA-17425)
 + * Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations 
(CASSANDRA-17495)
 + * Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
 +Merged from 4.1:
   * Skip ColumnFamilyStore#topPartitions initialization when client or tool 
mode (CASSANDRA-18697)
 +Merged from 4.0:
 + * Partial compaction can resurrect deleted data (CASSANDRA-18507)
++Merged from 3.11:
++Merged from 3.0:
++ * Remove unused suppressions (CASSANDRA-18724)
 +
 +
 +4.1.4
  Merged from 4.0:
   * Fix NTS log message when an unrecognized strategy option is passed 
(CASSANDRA-18679)
   * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to