Skip to content

Commit 506788c

Browse files
committed
[CALCITE-6656] Update owasp plugin from 5.2.2 to 10.0.4 in Avatica
also add option to specify NVD API key also add target to analyze depencies in all modules
1 parent b77c478 commit 506788c

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

build.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ val enableSpotBugs = props.bool("spotbugs", default = false)
6565
val skipCheckstyle by props()
6666
val skipAutostyle by props()
6767
val skipJavadoc by props()
68+
var nvdApiKey: String? = props.string("nvdApiKey")
6869
// Inherited from stage-vote-release-plugin: skipSign, useGpgCmd
6970
val enableMavenLocal by props()
7071
val enableGradleMetadata by props()
@@ -164,6 +165,15 @@ val javadocAggregateIncludingTests by tasks.registering(Javadoc::class) {
164165
setDestinationDir(file(layout.buildDirectory.get().file("docs/javadocAggregateIncludingTests")))
165166
}
166167

168+
if (nvdApiKey != null) {
169+
apply(plugin = "org.owasp.dependencycheck")
170+
dependencyCheck {
171+
nvd {
172+
apiKey = nvdApiKey
173+
}
174+
}
175+
}
176+
167177
allprojects {
168178
group = "org.apache.calcite.avatica"
169179
version = buildVersion
@@ -236,6 +246,7 @@ allprojects {
236246
fileMode = "664".toInt(8)
237247
}
238248

249+
tasks.register<DependencyReportTask>("allDependencies") {}
239250
tasks {
240251
withType<Javadoc>().configureEach {
241252
(options as StandardJavadocDocletOptions).apply {

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ com.google.protobuf.version=0.8.12
4242
de.thetaphi.forbiddenapis.version=3.7
4343
org.jetbrains.gradle.plugin.idea-ext.version=0.5
4444
org.nosphere.apache.rat.version=0.8.0
45-
org.owasp.dependencycheck.version=5.2.2
45+
#Last version to support Java 8
46+
org.owasp.dependencycheck.version=10.0.4
4647

4748
# TODO
4849
# error_prone_core.version=2.3.3

0 commit comments

Comments
 (0)