From 15858d03ff4d6901aa0de2d9d347f60070dd951b Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 8 Aug 2014 14:44:26 -0400 Subject: [PATCH] moved reporting functions from the core maven plugin to a utility class Former-commit-id: d63d2a7a5031038b9f86bbe94fc4a198374bd9f3 --- .../owasp/dependencycheck/maven/DependencyCheckMojo.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java index 88e277e16..b947b4617 100644 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java +++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java @@ -485,7 +485,6 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR if (cveUrl20Base != null && !cveUrl20Base.isEmpty()) { Settings.setString(Settings.KEYS.CVE_SCHEMA_2_0, cveUrl20Base); } - } /** @@ -498,7 +497,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR Engine engine = null; try { engine = executeDependencyCheck(); - generateExternalReports(engine, outputDirectory); + ReportingUtil.generateExternalReports(engine, outputDirectory, project.getName(), format); if (this.showSummary) { showSummary(engine.getDependencies()); } @@ -542,9 +541,9 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR try { engine = executeDependencyCheck(); if (this.externalReport) { - generateExternalReports(engine, reportOutputDirectory); + ReportingUtil.generateExternalReports(engine, reportOutputDirectory, project.getName(), format); } else { - generateMavenSiteReport(engine, sink); + ReportingUtil.generateMavenSiteReport(engine, sink, project.getName()); } } catch (DatabaseException ex) { logger.log(Level.SEVERE,