From b86fa133c56a943e2e127f248e2dacac0eac4d4e Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Tue, 2 Jan 2018 06:17:58 -0500 Subject: [PATCH] checkstyle updates --- .../dependencycheck/maven/BaseDependencyCheckMojo.java | 6 +++--- .../main/java/org/owasp/dependencycheck/utils/Settings.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git 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 index 1e9e894c2..476038635 100644 --- 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 @@ -968,7 +968,7 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma * @param currentEx the primary exception collection * @param newEx the new exception collection to add * @return the combined exception collection - * @throws MojoExecutionException + * @throws MojoExecutionException thrown if dependency-check is configured to fail on errors */ private ExceptionCollection handleAnalysisExceptions(ExceptionCollection currentEx, ExceptionCollection newEx) throws MojoExecutionException { ExceptionCollection returnEx = currentEx; @@ -1365,8 +1365,8 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma msg = String.format("%n%nOne or more dependencies were identified with vulnerabilities: %n%s%n%n" + "See the dependency-check report for more details.%n%n", ids.toString()); } else { - msg = String.format("%n%nOne or more dependencies were identified with vulnerabilities that have a CVSS score greater than or equal to '%.1f': " - + "%n%s%n%nSee the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString()); + msg = String.format("%n%nOne or more dependencies were identified with vulnerabilities that have a CVSS score greater than or equal " + + "to '%.1f': %n%s%n%nSee the dependency-check report for more details.%n%n", failBuildOnCVSS, ids.toString()); } } else { msg = String.format("%n%nOne or more dependencies were identified with vulnerabilities.%n%n" diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java index 56fca5188..b35677f3c 100644 --- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java +++ b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java @@ -453,13 +453,13 @@ public final class Settings { */ public static final String ENABLE_BATCH_UPDATES = "database.batchinsert.enabled"; /** - * Size of database batch inserts + * Size of database batch inserts. */ public static final String MAX_BATCH_SIZE = "database.batchinsert.maxsize"; /** * The key that specifies the class name of the H2 database shutdown hook. */ - public static String H2DB_SHUTDOWN_HOOK = "data.h2.shutdownhook"; + public static final String H2DB_SHUTDOWN_HOOK = "data.h2.shutdownhook"; /** * private constructor because this is a "utility" class containing