From 41b50747c5e4dfe696ff1cb6d4eb708ced2e71ab Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 15 Mar 2024 05:57:46 -0400 Subject: [PATCH] fix: correct 9.x data directory (#378) --- .../owasp/dependencycheck/gradle/extension/DataExtension.groovy | 2 +- src/main/resources/task.properties | 2 +- .../gradle/DependencyCheckGradlePluginSpec.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/groovy/org/owasp/dependencycheck/gradle/extension/DataExtension.groovy b/src/main/groovy/org/owasp/dependencycheck/gradle/extension/DataExtension.groovy index 3d28c99..337fb4f 100644 --- a/src/main/groovy/org/owasp/dependencycheck/gradle/extension/DataExtension.groovy +++ b/src/main/groovy/org/owasp/dependencycheck/gradle/extension/DataExtension.groovy @@ -27,7 +27,7 @@ import org.gradle.api.Project class DataExtension { DataExtension(Project project) { - directory = "${project.gradle.gradleUserHomeDir}/dependency-check-data/7.0" + directory = "${project.gradle.gradleUserHomeDir}/dependency-check-data/9.0" } /** diff --git a/src/main/resources/task.properties b/src/main/resources/task.properties index 89cfc0f..2704088 100644 --- a/src/main/resources/task.properties +++ b/src/main/resources/task.properties @@ -1,6 +1,6 @@ # the path to the data directory ### Do not define the path here - it is defined in DataExtension -### data.directory=[JAR]/../../dependency-check-data/5.0 +### data.directory=[JAR]/../../dependency-check-data/9.0 # disable the central analyzer by default analyzer.central.enabled=false \ No newline at end of file diff --git a/src/test/groovy/org/owasp/dependencycheck/gradle/DependencyCheckGradlePluginSpec.groovy b/src/test/groovy/org/owasp/dependencycheck/gradle/DependencyCheckGradlePluginSpec.groovy index 0fd8052..5f9257a 100644 --- a/src/test/groovy/org/owasp/dependencycheck/gradle/DependencyCheckGradlePluginSpec.groovy +++ b/src/test/groovy/org/owasp/dependencycheck/gradle/DependencyCheckGradlePluginSpec.groovy @@ -43,7 +43,7 @@ class DependencyCheckGradlePluginSpec extends Specification { DependencyCheckExtension extension = project.extensions.findByName('dependencyCheck') as DependencyCheckExtension expect: - extension.data.directory == "${project.gradle.gradleUserHomeDir}/dependency-check-data/7.0" + extension.data.directory == "${project.gradle.gradleUserHomeDir}/dependency-check-data/9.0" } def "dependencyCheckAnalyze task exists"() {