From f7974b324bff1d7b142c34c921f49274994344bb Mon Sep 17 00:00:00 2001 From: Anthony Whitford Date: Sat, 5 Sep 2015 22:25:38 -0700 Subject: [PATCH 1/2] Exclude generated HelpMojo.java file from Checkstyle analysis. --- dependency-check-maven/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index 49231cc42..0ae143e8e 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -230,6 +230,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. maven-checkstyle-plugin ${reporting.checkstyle-plugin.version} + **/HelpMojo.java false false ${basedir}/../src/main/config/checkstyle-checks.xml From 2a50dcba9d0827c77e44b3ad9440f014ff5f3a3d Mon Sep 17 00:00:00 2001 From: Anthony Whitford Date: Sat, 5 Sep 2015 22:25:59 -0700 Subject: [PATCH 2/2] Removed Checkstyle and PMD violations. --- .../maven/BaseDependencyCheckMojo.java | 25 ++++--------------- .../owasp/dependencycheck/maven/Engine.java | 4 +-- .../dependencycheck/maven/PurgeMojo.java | 1 - 3 files changed, 7 insertions(+), 23 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 74ec5304d..b07cadefe 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 @@ -30,8 +30,6 @@ import java.io.OutputStream; import java.util.List; import java.util.Locale; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -50,7 +48,6 @@ import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Identifier; import org.owasp.dependencycheck.dependency.Vulnerability; import org.owasp.dependencycheck.reporting.ReportGenerator; -import org.owasp.dependencycheck.utils.DependencyVersion; import org.owasp.dependencycheck.utils.Settings; /** @@ -79,18 +76,8 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma /** * The Maven Project Object. */ - @Parameter(property = "project", required=true, readonly=true) + @Parameter(property = "project", required = true, readonly = true) private MavenProject project; - /** - * A reference to the local repository. - */ - @Parameter(property = "localRepository", readonly = true) - private ArtifactRepository localRepository; - /** - * References to the remote repositories. - */ - @Parameter(property = "project.remoteArtifactRepositories", readonly = true) - private List remoteRepositories; /** * List of Maven project of the current build */ @@ -434,7 +421,7 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma final Object obj = current.getContextValue(getDataFileContextKey()); if (obj != null) { if (obj instanceof String) { - File f = new File((String) obj); + final File f = new File((String) obj); return f; } } else { @@ -923,11 +910,9 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma file = new File(writeTo, dataFileName); } final File parent = file.getParentFile(); - if (!parent.isDirectory()) { - if (parent.mkdirs()) { - getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.", - parent.getAbsolutePath())); - } + if (!parent.isDirectory() && parent.mkdirs()) { + getLog().error(String.format("Directory '%s' does not exist and cannot be created; unable to write data file.", + parent.getAbsolutePath())); } OutputStream os = null; diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/Engine.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/Engine.java index 900bcaef4..f849c8a7e 100644 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/Engine.java +++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/Engine.java @@ -117,7 +117,7 @@ public class Engine extends org.owasp.dependencycheck.Engine { */ @Override protected Analyzer initializeAnalyzer(Analyzer analyzer) { - if ((analyzer instanceof CPEAnalyzer)) { + if (analyzer instanceof CPEAnalyzer) { CPEAnalyzer cpe = getPreviouslyLoadedCPEAnalyzer(); if (cpe != null && cpe.isOpen()) { return cpe; @@ -152,7 +152,7 @@ public class Engine extends org.owasp.dependencycheck.Engine { */ @Override protected void closeAnalyzer(Analyzer analyzer) { - if ((analyzer instanceof CPEAnalyzer)) { + if (analyzer instanceof CPEAnalyzer) { if (getPreviouslyLoadedCPEAnalyzer() == null) { super.closeAnalyzer(analyzer); } diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java index d9f766498..4d387d4bd 100644 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java +++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java @@ -25,7 +25,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.owasp.dependencycheck.data.nvdcve.DatabaseException; import org.owasp.dependencycheck.utils.Settings; /**