natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Brandon Williams 2023-08-08 10:29:38 -05:00
parent d24baecac9 3dd2665f12
commit 5a9b79bb83
2 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.build/dependency-check-suppressions.xml
View File

@ -20,15 +20,6 @@
https://jeremylong.github.io/DependencyCheck/general/suppression.html
-->
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
<!-- not applicable since 4.0 -->
<packageUrl regex="true">^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$</packageUrl>
<cve>CVE-2018-8016</cve>
<cve>CVE-2019-2684</cve>
<cve>CVE-2020-13946</cve>
<cve>CVE-2020-17516</cve>
<cve>CVE-2021-44521</cve>
</suppress>
<suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-17907 -->
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
@ -44,42 +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>
</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 +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>

3
CHANGES.txt
View File

@ -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