github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-19 10:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

finished deprecating the application name argument in favor of project name per issue #320

Browse Source
This commit is contained in:
Jeremy Long
2015-08-29 07:12:40 -04:00
parent 8bb92815cb
commit b293873640
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.java
View File

@@ -145,13 +145,15 @@ public class DependencyCheckTask extends Task {
/**
* The application name for the report.
*/
private String applicationName = "Dependency-Check";
@Deprecated
private String applicationName = null;
/**
* Get the value of applicationName.
*
* @return the value of applicationName
*/
@Deprecated
public String getApplicationName() {
return applicationName;
}
@@ -161,9 +163,37 @@ public class DependencyCheckTask extends Task {
*
* @param applicationName new value of applicationName
*/
@Deprecated
public void setApplicationName(String applicationName) {
this.applicationName = applicationName;
}
private String projectName = "Dependency-Check";
/**
* Get the value of projectName.
*
* @return the value of projectName
*/
public String getProjectName() {
if (applicationName != null) {
log("Configuration 'applicationName' has been deprecated, please use 'projectName' instead", Project.MSG_WARN);
if ("Dependency-Check".equals(projectName)) {
projectName = applicationName;
}
}
return projectName;
}
/**
* Set the value of projectName.
*
* @param projectName new value of projectName
*/
public void setProjectName(String projectName) {
this.projectName = projectName;
}
/**
* The location of the data directory that contains
*/
@@ -279,8 +309,7 @@ public class DependencyCheckTask extends Task {
}
/**
* The report format to be generated (HTML, XML, VULN, ALL). This configuration option has no affect if using this within the
* Site plugin unless the externalReport is set to true. Default is HTML.
* The report format to be generated (HTML, XML, VULN, ALL). Default is HTML.
*/
private String reportFormat = "HTML";
@@ -933,7 +962,7 @@ public class DependencyCheckTask extends Task {
cve.close();
}
}
final ReportGenerator reporter = new ReportGenerator(applicationName, engine.getDependencies(), engine.getAnalyzers(), prop);
final ReportGenerator reporter = new ReportGenerator(getProjectName(), engine.getDependencies(), engine.getAnalyzers(), prop);
reporter.generateReports(reportOutputDirectory, reportFormat);
if (this.failBuildOnCVSS <= 10) {