Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve initialization problem using ODC-core 11.0.0 #415

Merged
merged 4 commits into from
Oct 23, 2024
Merged

fix: resolve initialization problem using ODC-core 11.0.0 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94dcb0f
fix: ensure Downloader is initialized
jeremylong Oct 23, 2024
bb1c4b6
fix: ensure test cases use mirror for the NVD data
jeremylong Oct 23, 2024
c7f97e5
build(deps): bump dependency-check-core from 10.0.4 to 11.0.0
jeremylong Oct 23, 2024
3fc3a38
docs: update for release 11.0.0
jeremylong Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.owasp:dependency-check-gradle:10.0.4'
classpath 'org.owasp:dependency-check-gradle:11.0.0'
}
}

Expand Down Expand Up @@ -91,7 +91,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.owasp:dependency-check-gradle:10.0.4'
classpath 'org.owasp:dependency-check-gradle:11.0.0'
}
}

Expand All @@ -108,7 +108,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.owasp:dependency-check-gradle:10.0.4'
classpath 'org.owasp:dependency-check-gradle:11.0.0'
}
}

Expand Down Expand Up @@ -137,7 +137,7 @@ subprojects {

```kotlin
plugins {
id("org.owasp.dependencycheck") version "10.0.4" apply false
id("org.owasp.dependencycheck") version "11.0.0" apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
odc = '10.0.4'
odc = '11.0.0'
spock = '2.3-groovy-3.0'
junit = '5.10.3'

Expand Down
4 changes: 3 additions & 1 deletion src/main/groovy/org/owasp/dependencycheck/gradle/tasks/ConfiguredTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.gradle.api.InvalidUserDataException
import org.gradle.api.tasks.Internal
import org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension
import org.owasp.dependencycheck.gradle.service.SlackNotificationSenderService
import org.owasp.dependencycheck.utils.Downloader
import org.owasp.dependencycheck.utils.Settings

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


settings.setBooleanIfNotNull(ANALYZER_NODE_PACKAGE_ENABLED, select(config.analyzers.nodePackage.enabled, config.analyzers.nodeEnabled))
settings.setBooleanIfNotNull(ANALYZER_NODE_PACKAGE_SKIPDEV, config.analyzers.nodePackage.skipDevDependencies)
settings.setBooleanIfNotNull(ANALYZER_NODE_AUDIT_ENABLED, select(config.analyzers.nodeAudit.enabled, config.analyzers.nodeAuditEnabled))
Expand All @@ -185,6 +185,8 @@ abstract class ConfiguredTask extends DefaultTask {
settings.setBooleanIfNotNull(ANALYZER_NODE_AUDIT_USE_CACHE, config.cache.nodeAudit)
settings.setBooleanIfNotNull(ANALYZER_CENTRAL_USE_CACHE, config.cache.central)
settings.setBooleanIfNotNull(ANALYZER_OSSINDEX_USE_CACHE, config.cache.ossIndex)

Downloader.getInstance().configure(settings);
}

private void configureSlack(Settings settings) {
Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/scanAdditionalCpesConfiguration.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ dependencyCheck {
cpe = "cpe:2.3:a:apache:commons_fileupload:1.3.1:*:*:*:*:*:*:*"
}
}
nvd {
datafeedUrl = 'https://jeremylong.github.io/DependencyCheck/hb_nvd/'
}
}
Loading