From 1b9a3bd4bd5b9b1d088b9cbc52b67ced406999ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kimminich?= Date: Wed, 16 Apr 2014 16:35:40 +0200 Subject: [PATCH 1/2] extracted logger as field Former-commit-id: e4d83411e9e2d529b0035748c52d9164e8837379 --- .../maven/DependencyCheckMojo.java | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 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 e447b51cf..a42796a3d 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 @@ -69,6 +69,8 @@ import org.owasp.dependencycheck.utils.Settings; requiresOnline = true) public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageReport { + private final Logger logger = Logger.getLogger(DependencyCheckMojo.class.getName()); + /** * The properties file location. */ @@ -398,7 +400,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR cve.open(); prop = cve.getDatabaseProperties(); } catch (DatabaseException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, "Unable to retrieve DB Properties", ex); + logger.log(Level.FINE, "Unable to retrieve DB Properties", ex); } finally { if (cve != null) { cve.close(); @@ -408,13 +410,13 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR try { r.generateReports(outDirectory.getCanonicalPath(), format); } catch (IOException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, + logger.log(Level.SEVERE, "Unexpected exception occurred during analysis; please see the verbose error log for more details."); - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); + logger.log(Level.FINE, null, ex); } catch (Throwable ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, + logger.log(Level.SEVERE, "Unexpected exception occurred during analysis; please see the verbose error log for more details."); - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); + logger.log(Level.FINE, null, ex); } } @@ -820,14 +822,14 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE); Settings.mergeProperties(mojoProperties); } catch (IOException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.WARNING, "Unable to load the dependency-check ant task.properties file."); - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); + logger.log(Level.WARNING, "Unable to load the dependency-check ant task.properties file."); + logger.log(Level.FINE, null, ex); } finally { if (mojoProperties != null) { try { mojoProperties.close(); } catch (IOException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINEST, null, ex); + logger.log(Level.FINEST, null, ex); } } } @@ -947,9 +949,9 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR checkForFailure(engine.getDependencies()); } } catch (DatabaseException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, + logger.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped"); - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, "", ex); + logger.log(Level.FINE, "", ex); } finally { if (engine != null) { engine.cleanup(); @@ -987,9 +989,9 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR generateMavenSiteReport(engine, sink); } } catch (DatabaseException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, + logger.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped"); - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, "", ex); + logger.log(Level.FINE, "", ex); } finally { if (engine != null) { engine.cleanup(); @@ -1012,8 +1014,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR } else if ("VULN".equalsIgnoreCase(this.format)) { return "dependency-check-vulnerability"; } else { - Logger.getLogger(DependencyCheckMojo.class - .getName()).log(Level.WARNING, "Unknown report format used during site generatation."); + logger.log(Level.WARNING, "Unknown report format used during site generatation."); return "dependency-check-report"; } } @@ -1151,9 +1152,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR final String msg = String.format("%n%n" + "One or more dependencies were identified with known vulnerabilities:%n%n%s" + "%n%nSee the dependency-check report for more details.%n%n", summary.toString()); - Logger - .getLogger(DependencyCheckMojo.class - .getName()).log(Level.WARNING, msg); + logger.log(Level.WARNING, msg); } } } From bd32eeeaa2d7d0a886d135b21b83c9fa552f1e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kimminich?= Date: Thu, 17 Apr 2014 11:17:17 +0200 Subject: [PATCH 2/2] fixed documentation of suppressionFile parameter Former-commit-id: 5260eb964cd7183adff13f3ef180233499452015 --- .../org/owasp/dependencycheck/maven/DependencyCheckMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a42796a3d..f5d1d9885 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 @@ -202,7 +202,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR @Parameter(property = "connectionTimeout", defaultValue = "", required = false) private String connectionTimeout = null; /** - * The Connection Timeout. + * The path to the suppression file. */ @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal"}) @Parameter(property = "suppressionFile", defaultValue = "", required = false)