github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-21 08:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed default value that over-wrote the properties file value

Browse Source
This commit is contained in:
Jeremy Long
2015-10-23 06:22:58 -04:00
parent 520f3cb09a
commit 5c25351884
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java
View File

@@ -245,14 +245,14 @@ public class Check extends Update {
* Sets whether auto-updating of the NVD CVE/CPE data is enabled. It is not recommended that this be turned to false. Default * Sets whether auto-updating of the NVD CVE/CPE data is enabled. It is not recommended that this be turned to false. Default
* is true. * is true.
*/ */
private boolean autoUpdate = true; private Boolean autoUpdate;
/** /**
* Get the value of autoUpdate. * Get the value of autoUpdate.
* *
* @return the value of autoUpdate * @return the value of autoUpdate
*/ */
public boolean isAutoUpdate() { public Boolean isAutoUpdate() {
return autoUpdate; return autoUpdate;
} }
@@ -261,7 +261,7 @@ public class Check extends Update {
* *
* @param autoUpdate new value of autoUpdate * @param autoUpdate new value of autoUpdate
*/ */
public void setAutoUpdate(boolean autoUpdate) { public void setAutoUpdate(Boolean autoUpdate) {
this.autoUpdate = autoUpdate; this.autoUpdate = autoUpdate;
} }
/** /**
@@ -839,12 +839,15 @@ public class Check extends Update {
/** /**
* Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system properties
* required to change the proxy server, port, and connection timeout. * required to change the proxy server, port, and connection timeout.
*
* @throws BuildException thrown when an invalid setting is configured.
*/ */
@Override @Override
protected void populateSettings() { protected void populateSettings() throws BuildException {
super.populateSettings(); super.populateSettings();
Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate); if (autoUpdate != null) {
Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
}
if (suppressionFile != null && !suppressionFile.isEmpty()) { if (suppressionFile != null && !suppressionFile.isEmpty()) {
Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile); Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile);
} }