Skip to content

Commit 6eafe99

Browse files
authored
fix: resolve initialization problem using ODC-core 11.0.0 (#415)
1 parent 91e31c7 commit 6eafe99

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ buildscript {
5454
mavenCentral()
5555
}
5656
dependencies {
57-
classpath 'org.owasp:dependency-check-gradle:10.0.4'
57+
classpath 'org.owasp:dependency-check-gradle:11.0.0'
5858
}
5959
}
6060
@@ -91,7 +91,7 @@ buildscript {
9191
mavenCentral()
9292
}
9393
dependencies {
94-
classpath 'org.owasp:dependency-check-gradle:10.0.4'
94+
classpath 'org.owasp:dependency-check-gradle:11.0.0'
9595
}
9696
}
9797
@@ -108,7 +108,7 @@ buildscript {
108108
mavenCentral()
109109
}
110110
dependencies {
111-
classpath 'org.owasp:dependency-check-gradle:10.0.4'
111+
classpath 'org.owasp:dependency-check-gradle:11.0.0'
112112
}
113113
}
114114
@@ -137,7 +137,7 @@ subprojects {
137137

138138
```kotlin
139139
plugins {
140-
id("org.owasp.dependencycheck") version "10.0.4" apply false
140+
id("org.owasp.dependencycheck") version "11.0.0" apply false
141141
}
142142

143143
allprojects {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
odc = '10.0.4'
2+
odc = '11.0.0'
33
spock = '2.3-groovy-3.0'
44
junit = '5.10.3'
55

src/main/groovy/org/owasp/dependencycheck/gradle/tasks/ConfiguredTask.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.gradle.api.InvalidUserDataException
2424
import org.gradle.api.tasks.Internal
2525
import org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension
2626
import org.owasp.dependencycheck.gradle.service.SlackNotificationSenderService
27+
import org.owasp.dependencycheck.utils.Downloader
2728
import org.owasp.dependencycheck.utils.Settings
2829

2930
import static org.owasp.dependencycheck.utils.Settings.KEYS.*
@@ -158,7 +159,6 @@ abstract class ConfiguredTask extends DefaultTask {
158159
settings.setBooleanIfNotNull(ANALYZER_CPANFILE_ENABLED, config.analyzers.cpanEnabled)
159160
settings.setBooleanIfNotNull(ANALYZER_NUGETCONF_ENABLED, config.analyzers.nugetconfEnabled)
160161

161-
162162
settings.setBooleanIfNotNull(ANALYZER_NODE_PACKAGE_ENABLED, select(config.analyzers.nodePackage.enabled, config.analyzers.nodeEnabled))
163163
settings.setBooleanIfNotNull(ANALYZER_NODE_PACKAGE_SKIPDEV, config.analyzers.nodePackage.skipDevDependencies)
164164
settings.setBooleanIfNotNull(ANALYZER_NODE_AUDIT_ENABLED, select(config.analyzers.nodeAudit.enabled, config.analyzers.nodeAuditEnabled))
@@ -185,6 +185,8 @@ abstract class ConfiguredTask extends DefaultTask {
185185
settings.setBooleanIfNotNull(ANALYZER_NODE_AUDIT_USE_CACHE, config.cache.nodeAudit)
186186
settings.setBooleanIfNotNull(ANALYZER_CENTRAL_USE_CACHE, config.cache.central)
187187
settings.setBooleanIfNotNull(ANALYZER_OSSINDEX_USE_CACHE, config.cache.ossIndex)
188+
189+
Downloader.getInstance().configure(settings);
188190
}
189191

190192
private void configureSlack(Settings settings) {

src/test/resources/scanAdditionalCpesConfiguration.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@ dependencyCheck {
2323
cpe = "cpe:2.3:a:apache:commons_fileupload:1.3.1:*:*:*:*:*:*:*"
2424
}
2525
}
26+
nvd {
27+
datafeedUrl = 'https://jeremylong.github.io/DependencyCheck/hb_nvd/'
28+
}
2629
}

0 commit comments

Comments
 (0)