Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.owasp.dependencycheck.utils.DownloadFailedException;
import org.owasp.dependencycheck.utils.Downloader;
import org.owasp.dependencycheck.utils.InvalidSettingException;
import org.owasp.dependencycheck.utils.Pair;
import org.owasp.dependencycheck.utils.ResourceNotFoundException;
import org.owasp.dependencycheck.utils.Settings;
import org.owasp.dependencycheck.utils.TooManyRequestsException;
Expand Down Expand Up @@ -565,9 +564,8 @@ protected final Map<String, String> getUpdatesNeeded(FeedUrl feedUrl, Properties
LOGGER.debug("starting getUpdatesNeeded() ...");
final Map<String, String> updates = new HashMap<>();
if (dbProperties != null && !dbProperties.isEmpty()) {
Pair<Integer, Integer> yearRange = FeedUrl.toYearRange(settings, now);
int startYear = yearRange.getLeft();
int endYear = yearRange.getRight();
int startYear = FeedUrl.startYear();
int endYear = FeedUrl.endYear(now);
boolean needsFullUpdate = false;
for (int y = startYear; y <= endYear; y++) {
final ZonedDateTime val = dbProperties.getTimestamp(DatabaseProperties.NVD_CACHE_LAST_MODIFIED + "." + y);
Expand Down Expand Up @@ -653,7 +651,7 @@ private Properties generateRemoteDataFeedCachePropertiesFromMetadata(FeedUrl dat
DatabaseProperties.setTimestamp(properties, NVD_API_CACHE_MODIFIED_DATE + ".modified", lmd);
DatabaseProperties.setTimestamp(properties, NVD_API_CACHE_MODIFIED_DATE, lmd);

metaFeedUrl.getLastModifiedDatePropertiesByYear(this.settings, ZonedDateTime.now(ZoneOffset.UTC))
metaFeedUrl.getLastModifiedDatePropertiesByYear(ZonedDateTime.now(ZoneOffset.UTC))
.forEach((k, v) -> DatabaseProperties.setTimestamp(properties, k, v));
return properties;
}
Expand Down Expand Up @@ -740,13 +738,15 @@ protected static FeedUrl extractFromUrlOptionalPattern(String url) {
return new FeedUrl(baseUrl, pattern);
}

private static @NonNull Pair<Integer, Integer> toYearRange(Settings settings, ZonedDateTime now) {
public static int startYear() {
return 2002;
}

private static int endYear(ZonedDateTime now) {
// for establishing the current year use the timezone where the new year starts first
// as from that moment on CNAs might start assigning CVEs with the new year depending
// on the CNA's timezone
final int startYear = settings.getInt(Settings.KEYS.NVD_API_DATAFEED_START_YEAR, 2002);
final int endYear = now.withZoneSameInstant(ZONE_GLOBAL_EARLIEST).getYear();
return new Pair<>(startYear, endYear);
return now.withZoneSameInstant(ZONE_GLOBAL_EARLIEST).getYear();
}

private @NonNull ZonedDateTime getLastModifiedFor(int year) throws UpdateException {
Expand All @@ -764,10 +764,11 @@ protected static FeedUrl extractFromUrlOptionalPattern(String url) {
}
}

Map<String, ZonedDateTime> getLastModifiedDatePropertiesByYear(Settings settings, ZonedDateTime now) throws UpdateException {
Pair<Integer, Integer> yearRange = toYearRange(settings, now);
Map<String, ZonedDateTime> getLastModifiedDatePropertiesByYear(ZonedDateTime now) throws UpdateException {
int startYear = startYear();
int endYear = endYear(now);
Map<String, ZonedDateTime> lastModifiedDateProperties = new LinkedHashMap<>();
for (int y = yearRange.getLeft(); y <= yearRange.getRight(); y++) {
for (int y = startYear; y <= endYear; y++) {
try {
lastModifiedDateProperties.put(NVD_API_CACHE_MODIFIED_DATE + "." + y, getLastModifiedFor(y));
} catch (UpdateException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private Map<String, ZonedDateTime> retrieveUntil(ZonedDateTime until) throws Upd
Map<String, ZonedDateTime> lastModifieds;
NvdApiDataSource.FeedUrl feedUrl = extractFromUrlOptionalPattern("https://internal.server/nist/nvdcve-{0}.json.gz");

lastModifieds = feedUrl.getLastModifiedDatePropertiesByYear(new Settings(), until);
lastModifieds = feedUrl.getLastModifiedDatePropertiesByYear(until);

assertThat(lastModifieds.values(), everyItem(Matchers.equalTo(ZonedDateTime.of(2013, 1, 1, 12, 0, 0, 0, ZoneOffset.UTC))));
return lastModifieds;
Expand Down
2 changes: 1 addition & 1 deletion maven/src/it/1512-transitive-test/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f old/pom.xml
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f new/pom.xml
invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -f old/pom.xml
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -f new/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false
2 changes: 1 addition & 1 deletion maven/src/it/1677-dependency-management/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ verify --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -X
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ verify --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -X
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=JSON -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=JSON
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#

# NOTE needs a -U as maven invoker builds otherwise cannot resolve RELEASE/SNAPSHOT meta-versions
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ -U --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ -U --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#
# Note: the first goals needs the -U in order to properly resolve the RELEASE / LATEST meta-versions
invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -f dep/pom.xml -U
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f main/pom.xml
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -f main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ install --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ install --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
2 changes: 1 addition & 1 deletion maven/src/it/618-aggregator-update-only/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.central.enabled=false -Danalyzer.ossindex.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:update-only -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.central.enabled=false -Danalyzer.ossindex.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:update-only
2 changes: 1 addition & 1 deletion maven/src/it/629-jackson-dataformat/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML
2 changes: 1 addition & 1 deletion maven/src/it/690-threadsafety/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Dformat=JSON -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -T 8 -X
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -T 8 -X
2 changes: 1 addition & 1 deletion maven/src/it/710-pom-parse-error/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=JSON
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=JSON
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
2 changes: 1 addition & 1 deletion maven/src/it/740-aggregate/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -X -T 1C
invoker.goals = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -X -T 1C
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.buildResult = failure
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate
2 changes: 1 addition & 1 deletion maven/src/it/846-site-plugin/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ site --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Dodcversion=${project.version}
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ site --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Dodcversion=${project.version}
2 changes: 1 addition & 1 deletion maven/src/it/artifactory-analyzer/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=XML -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Danalyzer.artifactory.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://dependency-check.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=XML -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Danalyzer.artifactory.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,11 @@ public static final class KEYS {
public static final String NVD_API_DATAFEED_BEARER_TOKEN = "nvd.api.datafeed.bearertoken";
/**
* The starting year for the NVD CVE Data feed cache.
*
* @deprecated This property was generally unsafe to use, and is now unused by the code, to be removed in a later release.
*/
@Deprecated(since = "13.0.1", forRemoval = true)
public static final String NVD_API_DATAFEED_START_YEAR = "nvd.api.datafeed.startyear";
//END NEW
/**
* The key to determine if the NVD CVE analyzer is enabled.
*/
Expand Down
Loading