diff --git a/.build/dependency-check-suppressions.xml b/.build/dependency-check-suppressions.xml index d7a66cb3bf..6c2e52c3ca 100644 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@ -20,15 +20,6 @@ https://jeremylong.github.io/DependencyCheck/general/suppression.html --> - - - ^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ - CVE-2018-8016 - CVE-2019-2684 - CVE-2020-13946 - CVE-2020-17516 - CVE-2021-44521 - ^pkg:maven/org\.yaml/snakeyaml@.*$ @@ -44,42 +35,6 @@ CVE-2021-4235 CVE-2017-18640 - - - ^pkg:maven/net\.openhft/chronicle\-wire@.*$ - cpe:/a:wire:wire - - - - ^pkg:maven/org\.apache\.commons.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-io/.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-cli/.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-codec/.*$ - CVE-2021-37533 - - - - ^pkg:maven/io\.netty/netty\-all@.*$ - CVE-2021-21290 - CVE-2021-21295 - CVE-2021-21409 - CVE-2021-37136 - CVE-2021-37137 - CVE-2021-43797 - CVE-2022-24823 - CVE-2022-41881 - CVE-2022-41915 - CVE-2023-34462 - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ @@ -87,11 +42,4 @@ CVE-2022-42004 CVE-2023-35116 - - - - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$ - CVE-2022-45688 - - diff --git a/CHANGES.txt b/CHANGES.txt index 921ad41f4d..278b93387d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -178,6 +178,9 @@ 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