merged master to keep branch up to date

2026-05-01 04:34:45 +02:00 · 2017-09-07 06:08:06 -04:00
parent 7f92109bde 519d90e3d0
commit 33640ccfbb
8 changed files with 98 additions and 21 deletions
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
+++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
@@ -643,6 +643,11 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
     * @throws MavenReportException if a maven report exception occurs
     */
    public void generate(Sink sink, Locale locale) throws MavenReportException {
+        if (skip) {
+            getLog().info("Skipping report generation " + getName(Locale.US));
+            return;
+        }
+
        generatingSite = true;
        try {
            validateAggregate();