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
14 changes: 14 additions & 0 deletions ant/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,8 @@ public void setNodeAuditSkipDevDependencies(Boolean nodeAuditSkipDevDependencies
*/
@Deprecated
public void setRetirejsFilterNonVulnerable(Boolean retireJsFilterNonVulnerable) {
log("'retirejsFilterNonVulnerable' is deprecated and may be removed in the next major release, please migrate to 'retireJsFilterNonVulnerable'",
Project.MSG_WARN);
this.retireJsFilterNonVulnerable = retireJsFilterNonVulnerable;
}

Expand All @@ -1026,6 +1028,8 @@ public void setRetireJsFilterNonVulnerable(Boolean retireJsFilterNonVulnerable)
*/
@Deprecated
public void addConfiguredRetirejsFilter(final RetirejsFilter retireJsFilter) {
log("'retirejsFilter' is deprecated and may be removed in the next major release, please migrate to 'retireJsFilter'",
Project.MSG_WARN);
retireJsFilters.add(retireJsFilter.getRegex());
}

Expand Down Expand Up @@ -1229,6 +1233,8 @@ public void setPathToDotnetCore(String pathToCore) {
*/
@Deprecated
public void setOssindexAnalyzerEnabled(Boolean ossindexAnalyzerEnabled) {
log("'ossindexAnalyzerEnabled' is deprecated and may be removed in the next major release, please migrate to 'ossIndexAnalyzerEnabled'",
Project.MSG_WARN);
this.ossindexAnalyzerEnabled = ossindexAnalyzerEnabled;
}

Expand All @@ -1249,6 +1255,8 @@ public void setOssIndexAnalyzerEnabled(Boolean ossIndexAnalyzerEnabled) {
*/
@Deprecated
public void setOssindexAnalyzerUseCache(Boolean ossindexAnalyzerUseCache) {
log("'ossindexAnalyzerUseCache' is deprecated and may be removed in the next major release, please migrate to 'ossIndexAnalyzerUseCache'",
Project.MSG_WARN);
this.ossindexAnalyzerUseCache = ossindexAnalyzerUseCache;
}

Expand All @@ -1269,6 +1277,8 @@ public void setOssIndexAnalyzerUseCache(Boolean ossIndexAnalyzerUseCache) {
*/
@Deprecated
public void setOssindexAnalyzerUrl(String ossindexAnalyzerUrl) {
log("'ossindexAnalyzerUrl' is deprecated and may be removed in the next major release, please migrate to 'ossIndexAnalyzerUrl'",
Project.MSG_WARN);
this.ossindexAnalyzerUrl = ossindexAnalyzerUrl;
}

Expand All @@ -1289,6 +1299,8 @@ public void setOssIndexAnalyzerUrl(String ossIndexAnalyzerUrl) {
*/
@Deprecated
public void setOssindexAnalyzerUsername(String ossindexAnalyzerUsername) {
log("'ossindexAnalyzerUsername' is deprecated and may be removed in the next major release, please migrate to 'ossIndexAnalyzerUsername'",
Project.MSG_WARN);
this.ossindexAnalyzerUsername = ossindexAnalyzerUsername;
}

Expand All @@ -1309,6 +1321,8 @@ public void setOssIndexAnalyzerUsername(String ossIndexAnalyzerUsername) {
*/
@Deprecated
public void setOssindexAnalyzerPassword(String ossindexAnalyzerPassword) {
log("'ossindexAnalyzerPassword' is deprecated and may be removed in the next major release, please migrate to 'ossIndexAnalyzerPassword'",
Project.MSG_WARN);
this.ossindexAnalyzerPassword = ossindexAnalyzerPassword;
}

Expand Down
12 changes: 12 additions & 0 deletions cli/src/main/java/org/owasp/dependencycheck/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,19 @@ protected void populateSettings(CliParser cli) throws InvalidSettingException {
String retireJsFilters = cli.getStringArgument(CliParser.ARGUMENT.RETIRE_JS_FILTERS);
if (retireJsFilters == null) {
retireJsFilters = cli.getStringArgument(CliParser.ARGUMENT.RETIREJS_FILTERS_DEPRECATED);
if (retireJsFilters != null) {
LOGGER.warn("'--{}' is deprecated and may be removed in the next major release, please migrate to '--{}'",
CliParser.ARGUMENT.RETIREJS_FILTERS_DEPRECATED, CliParser.ARGUMENT.RETIRE_JS_FILTERS);
}
}
settings.setStringIfNotNull(Settings.KEYS.ANALYZER_RETIREJS_FILTERS, retireJsFilters);
Boolean retireJsFilterNonVuln = cli.hasOption(CliParser.ARGUMENT.RETIRE_JS_FILTER_NON_VULNERABLE);
if (retireJsFilterNonVuln == null) {
retireJsFilterNonVuln = cli.hasOption(CliParser.ARGUMENT.RETIREJS_FILTER_NON_VULNERABLE_DEPRECATED);
if (retireJsFilterNonVuln != null) {
LOGGER.warn("'--{}' is deprecated and may be removed in the next major release, please migrate to '--{}'",
CliParser.ARGUMENT.RETIREJS_FILTER_NON_VULNERABLE_DEPRECATED, CliParser.ARGUMENT.RETIRE_JS_FILTER_NON_VULNERABLE);
}
}
settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RETIREJS_FILTER_NON_VULNERABLE, retireJsFilterNonVuln);
settings.setBoolean(Settings.KEYS.ANALYZER_JAR_ENABLED,
Expand Down Expand Up @@ -624,6 +632,10 @@ protected void populateSettings(CliParser cli) throws InvalidSettingException {
boolean retireJsDisabled = cli.isDisabled(CliParser.ARGUMENT.DISABLE_RETIRE_JS, Settings.KEYS.ANALYZER_RETIREJS_ENABLED);
if (!retireJsDisabled) {
retireJsDisabled = cli.isDisabled(CliParser.ARGUMENT.DISABLE_RETIREJS_DEPRECATED, Settings.KEYS.ANALYZER_RETIREJS_ENABLED);
if (retireJsDisabled) {
LOGGER.warn("'--{}' is deprecated and may be removed in the next major release, please migrate to '--{}'",
CliParser.ARGUMENT.DISABLE_RETIREJS_DEPRECATED, CliParser.ARGUMENT.DISABLE_RETIRE_JS);
}
}
settings.setBoolean(Settings.KEYS.ANALYZER_RETIREJS_ENABLED, !retireJsDisabled);
settings.setBoolean(Settings.KEYS.ANALYZER_SWIFT_PACKAGE_MANAGER_ENABLED,
Expand Down
Loading
Loading