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

Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Stefan Miklosovic 2025-04-03 09:17:38 +02:00
parent 27a6ef3ea8 147a224a88
commit abb3e8bdbb
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.build/build-owasp.xml
View File

@ -19,7 +19,7 @@
<project basedir="." name="apache-cassandra-owasp-tasks"
xmlns:unless="ant:unless"
xmlns:if="ant:if">
<property name="dependency-check.version" value="10.0.4"/>
<property name="dependency-check.version" value="12.1.0"/>
<property name="dependency-check.home" value="${tmp.dir}/dependency-check-ant-${dependency-check.version}"/>
<property name="dependency-check.archive.dir" value="${local.repository}/org/owasp/dependency-check-ant/${dependency-check.version}"/>
<property name="dependency-check.archive.name" value="dependency-check-ant-${dependency-check.version}-release.zip"/>
@ -34,7 +34,7 @@
unless="dependency-check-ant.archive.present">
<mkdir dir="${dependency-check.archive.dir}"/>
<get src="https://github.com/jeremylong/DependencyCheck/releases/download/v${dependency-check.version}/${dependency-check.archive.name}"
<get src="https://github.com/dependency-check/DependencyCheck/releases/download/v${dependency-check.version}/${dependency-check.archive.name}"
dest="${dependency-check.archive.dir}/${dependency-check.archive.name}" retries="3"/>
</target>

1
CHANGES.txt
View File

@ -23,6 +23,7 @@ Merged from 4.1:
* Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)
* Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking thread is interrupted (CASSANDRA-20084)
Merged from 4.0:
* Update OWASP dependency checker to version 12.1.0 (CASSANDRA-20501)
* Suppress CVE-2025-25193 (CASSANDRA-20504)
* Include in source tree and build packages a Snyk policy file that lists known false positives (CASSANDRA-20319)
* Update zstd-jni to 1.5.7-2 (CASSANDRA-20453)