Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Ariel Weisberg 2024-03-22 16:47:19 -04:00
commit 96692d7206
1 changed files with 6 additions and 1 deletions

View File

@ -46,6 +46,7 @@
<target name="-run-owasp-scan" description="Dependency-Check Analysis" <target name="-run-owasp-scan" description="Dependency-Check Analysis"
depends="-dependency-check-init,resolver-dist-lib"> depends="-dependency-check-init,resolver-dist-lib">
<property name="nvd.api.key" value="dummy" if:set="env.NVD_DATAFEED_URL" />
<fail unless:set="nvd.api.key"> <fail unless:set="nvd.api.key">
Please set the nvd.api.key property to your NVD API key. It is recommended to put that property into your Please set the nvd.api.key property to your NVD API key. It is recommended to put that property into your
~/.ant/build.properties file. You can get your API key from https://nvd.nist.gov/developers/request-an-api-key ~/.ant/build.properties file. You can get your API key from https://nvd.nist.gov/developers/request-an-api-key
@ -84,6 +85,9 @@
(1) https://nvd.nist.gov/vuln-metrics/cvss (1) https://nvd.nist.gov/vuln-metrics/cvss
--> -->
<condition property="nvdDatafeedUrl" value="${env.NVD_DATAFEED_URL}" else="">
<isset property="env.NVD_DATAFEED_URL" />
</condition>
<dependency-check projectname="Apache Cassandra" <dependency-check projectname="Apache Cassandra"
nvdApiKey="${nvd.api.key}" nvdApiKey="${nvd.api.key}"
reportoutputdirectory="${dependency-check.report.dir}" reportoutputdirectory="${dependency-check.report.dir}"
@ -95,7 +99,8 @@
failBuildOnCVSS="1" failBuildOnCVSS="1"
assemblyAnalyzerEnabled="false" assemblyAnalyzerEnabled="false"
dataDirectory="${nvd.data.dir}" dataDirectory="${nvd.data.dir}"
suppressionFile="${basedir}/.build/dependency-check-suppressions.xml"> suppressionFile="${basedir}/.build/dependency-check-suppressions.xml"
nvdDatafeedUrl="${nvdDatafeedUrl}">
<fileset refid="dependencies_to_check"/> <fileset refid="dependencies_to_check"/>
</dependency-check> </dependency-check>
</target> </target>