github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-14 15:53:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated CLI arguments for issue #48 and issue #33

Browse Source 
Former-commit-id: 58e6b9042814d9c76c51b7f0b88b6ec7ef50b938
This commit is contained in:
Jeremy Long
2014-01-25 06:09:59 -05:00
parent 29768576c8
commit 845fa89d0f
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java
View File

@@ -146,17 +146,22 @@ public class App {
*/
private void updateSettings(CliParser cli) {
boolean autoUpdate = cli.isAutoUpdate();
String connectionTimeout = cli.getConnectionTimeout();
String proxyUrl = cli.getProxyUrl();
String proxyPort = cli.getProxyPort();
String proxyUser = cli.getProxyUsername();
String proxyPass = cli.getProxyPassword();
String dataDirectory = cli.getDataDirectory();
File propertiesFile = cli.getPropertiesFile();
String suppressionFile = cli.getSuppressionFile();
boolean nexusDisabled = cli.isNexusDisabled();
String nexusUrl = cli.getNexusUrl();
final boolean autoUpdate = cli.isAutoUpdate();
final String connectionTimeout = cli.getConnectionTimeout();
final String proxyUrl = cli.getProxyUrl();
final String proxyPort = cli.getProxyPort();
final String proxyUser = cli.getProxyUsername();
final String proxyPass = cli.getProxyPassword();
final String dataDirectory = cli.getDataDirectory();
final File propertiesFile = cli.getPropertiesFile();
final String suppressionFile = cli.getSuppressionFile();
final boolean nexusDisabled = cli.isNexusDisabled();
final String nexusUrl = cli.getNexusUrl();
final String databaseDriverName = cli.getDatabaseDriverName();
final String databaseDriverPath = cli.getDatabaseDriverPath();
final String connectionString = cli.getConnectionString();
final String databaseUser = cli.getDatabaseUser();
final String databasePassword = cli.getDatabasePassword();
if (propertiesFile != null) {
try {
@@ -206,5 +211,21 @@ public class App {
if (nexusUrl != null && !nexusUrl.isEmpty()) {
Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
}
if (databaseDriverName != null && !databaseDriverName.isEmpty()) {
Settings.setString(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
}
if (databaseDriverPath != null && !databaseDriverPath.isEmpty()) {
Settings.setString(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
}
if (connectionString != null && !connectionString.isEmpty()) {
Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
}
if (databaseUser != null && !databaseUser.isEmpty()) {
Settings.setString(Settings.KEYS.DB_USER, databaseUser);
}
if (databasePassword != null && !databasePassword.isEmpty()) {
Settings.setString(Settings.KEYS.DB_PASSWORD, databasePassword);
}
}
}