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

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Brandon Williams 2023-08-08 10:03:31 -05:00
parent bee215cce6 5c4dd3b993
commit 60d04d6713
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,25 +63,6 @@
<cve>CVE-2023-34462</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-14183 -->
<suppress>
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
<cve>CVE-2017-5929</cve>
</suppress>
<suppress>
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
<cve>CVE-2017-5929</cve>
</suppress>
<!-- this was fixed in 3.0.22 -->
<suppress>
<packageUrl regex="true">^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$</packageUrl>
<cve>CVE-2019-2684</cve>
<cve>CVE-2020-13946</cve>
<cve>CVE-2020-17516</cve>
<cve>CVE-2021-44521</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-14760 -->
<suppress>
<packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
@ -90,24 +71,6 @@
<cve>CVE-2023-2976</cve>
</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>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-16606 -->
<suppress>
<packageUrl regex="true">^pkg:maven/org\.apache\.thrift/libthrift@.*$</packageUrl>
@ -136,10 +99,4 @@
<cve>CVE-2022-42004</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>

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346)
* Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202)
Merged from 3.0:
* Remove unused suppressions (CASSANDRA-18724)
* Upgrade OWASP to 8.3.1 (CASSANDRA-18650)
* Suppress CVE-2023-34462 (CASSANDRA-18649)
* Add support for AWS Ec2 IMDSv2 (CASSANDRA-16555)