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:
Stefan Miklosovic 2025-08-25 17:43:03 +02:00
parent 7c6ae891e7 af0197e195
commit 9598a96512
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.build/owasp/dependency-check-suppressions.xml
View File

@ -32,12 +32,6 @@
<cve>CVE-2025-25193</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-17966 -->
<suppress>
<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
<cve>CVE-2023-35116</cve>
</suppress>
<!-- https://issues.apache.org/jira/browse/CASSANDRA-19142 -->
<!-- https://issues.apache.org/jira/browse/CASSANDRA-20412 -->
<suppress>

11
.build/parent-maven-pom.xml
View File

@ -428,28 +428,29 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.3</version>
<version>2.19.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.3</version>
<version>2.19.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.3</version>
<version>2.19.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.3</version>
<version>2.19.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.15.3</version>
<version>2.19.2</version>
<scope>test</scope>
<!-- 2.19.2 would bring in snakeyaml 2.4, but we depend on 2.1 in prod code -->
<exclusions>
<exclusion>
<artifactId>snakeyaml</artifactId>

2
.snyk
View File

@ -2,8 +2,6 @@
# This file is autogenerated from .build/dependency-check-suppressions.xml
version: v1.25.0
ignore:
CVE-2023-35116:
- reason: https://issues.apache.org/jira/browse/CASSANDRA-17966 -- ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$
CVE-2023-44487:
- reason: https://issues.apache.org/jira/browse/CASSANDRA-18943 -- ^pkg:maven/io\.netty/netty\-.*@.*$
CVE-2023-6378:

1
CHANGES.txt
View File

@ -299,6 +299,7 @@ Merged from 4.1:
* Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
Merged from 4.0:
* Update Jackson to 2.19.2 (CASSANDRA-20848)
* Update commons-lang3 to 3.18.0 (CASSANDRA-20849)
* Add NativeTransportMaxConcurrentConnectionsPerIp to StorageProxyMBean (CASSANDRA-20642)
* Make secondary index implementations notified about rows in fully expired SSTables in compaction (CASSANDRA-20829)