You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2023/07/06 15:08:05 UTC
[cassandra] branch cassandra-4.0 updated (822589e382 -> c10c7375c1)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 822589e382 Merge branch 'cassandra-3.11' into cassandra-4.0
new 7150cc5b99 Suppress CVE-2023-34462
new 5326a39a1c Merge branch 'cassandra-3.0' into cassandra-3.11
new c10c7375c1 Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 1 +
2 files changed, 2 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c10c7375c15026651aa09589488d127070019bc0
Merge: 822589e382 5326a39a1c
Author: Brandon Williams <br...@apache.org>
AuthorDate: Thu Jul 6 10:07:12 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 1 +
2 files changed, 2 insertions(+)
diff --cc .build/dependency-check-suppressions.xml
index 26e3305a85,bffab75a23..ae7ff368a7
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@@ -72,19 -107,17 +72,20 @@@
<packageUrl regex="true">^pkg:maven/commons-codec/.*$</packageUrl>
<cve>CVE-2021-37533</cve>
</suppress>
-
- <!-- https://issues.apache.org/jira/browse/CASSANDRA-16606 -->
+ <!-- netty's http stuff is not applicable here -->
<suppress>
- <packageUrl regex="true">^pkg:maven/org\.apache\.thrift/libthrift@.*$</packageUrl>
- <cve>CVE-2015-3254</cve>
- <cve>CVE-2016-5397</cve>
- <cve>CVE-2018-1320</cve>
- <cve>CVE-2018-11798</cve>
- <cve>CVE-2019-0205</cve>
+ <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>
diff --cc CHANGES.txt
index d5b2c1fe0d,2c8a444f55..937dd869e9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,7 -4,9 +10,8 @@@ Merged from 3.11
* Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543)
* Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818
* 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:
+ * Suppress CVE-2023-34462 (CASSANDRA-18649)
* Add support for AWS Ec2 IMDSv2 (CASSANDRA-16555)
* Suppress CVE-2023-35116 (CASSANDRA-18630)
* Pass taskId from CompactionTask to system.compaction_history (CASSANDRA-12183)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org