Merge branch 'upmaster' into ruby-bundler

Conflicts:
	dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer
This commit is contained in:
Dale Visser
2015-08-27 14:05:36 -04:00
84 changed files with 4384 additions and 268 deletions

View File

@@ -222,6 +222,10 @@ public final class Settings {
* The properties key for whether the Nexus analyzer is enabled.
*/
public static final String ANALYZER_NEXUS_ENABLED = "analyzer.nexus.enabled";
/**
* The properties key for whether the node.js package analyzer is enabled.
*/
public static final String ANALYZER_NODE_PACKAGE_ENABLED = "analyzer.node.package.enabled";
/**
* The properties key for the Nexus search URL.
*/