github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 01:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

checkstyle correction

Browse Source
This commit is contained in:
Jeremy Long
2016-08-21 15:28:55 -04:00
parent 85c04f6e3e
commit 659785f972
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
View File

@@ -25,10 +25,8 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
//import org.apache.maven.artifact.Artifact;
import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.Artifact;
import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
@@ -623,7 +621,7 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
*/ */
// </editor-fold> // </editor-fold>
try { try {
DependencyNode dn = dependencyGraphBuilder.buildDependencyGraph(project, null, reactorProjects); final DependencyNode dn = dependencyGraphBuilder.buildDependencyGraph(project, null, reactorProjects);
return collectDependencies(engine, project, dn.getChildren()); return collectDependencies(engine, project, dn.getChildren());
} catch (DependencyGraphBuilderException ex) { } catch (DependencyGraphBuilderException ex) {
final String msg = String.format("Unable to build dependency graph on project %s", project.getName()); final String msg = String.format("Unable to build dependency graph on project %s", project.getName());
@@ -650,18 +648,18 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
if (excludeFromScan(dependencyNode.getArtifact().getScope())) { if (excludeFromScan(dependencyNode.getArtifact().getScope())) {
continue; continue;
} }
ArtifactRequest request = new ArtifactRequest(); final ArtifactRequest request = new ArtifactRequest();
request.setArtifact(new DefaultArtifact(dependencyNode.getArtifact().getId())); request.setArtifact(new DefaultArtifact(dependencyNode.getArtifact().getId()));
request.setRepositories(remoteRepos); request.setRepositories(remoteRepos);
try { try {
ArtifactResult result = repoSystem.resolveArtifact(repoSession, request); final ArtifactResult result = repoSystem.resolveArtifact(repoSession, request);
if (result.isResolved() && result.getArtifact() != null && result.getArtifact().getFile() != null) { if (result.isResolved() && result.getArtifact() != null && result.getArtifact().getFile() != null) {
final List<Dependency> deps = engine.scan(result.getArtifact().getFile().getAbsoluteFile()); final List<Dependency> deps = engine.scan(result.getArtifact().getFile().getAbsoluteFile());
if (deps != null) { if (deps != null) {
if (deps.size() == 1) { if (deps.size() == 1) {
final Dependency d = deps.get(0); final Dependency d = deps.get(0);
if (d != null) { if (d != null) {
Artifact a = result.getArtifact(); final Artifact a = result.getArtifact();
final MavenArtifact ma = new MavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion()); final MavenArtifact ma = new MavenArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion());
d.addAsEvidence("pom", ma, Confidence.HIGHEST); d.addAsEvidence("pom", ma, Confidence.HIGHEST);
d.addProjectReference(project.getName() + ":" + dependencyNode.getArtifact().getScope()); d.addProjectReference(project.getName() + ":" + dependencyNode.getArtifact().getScope());