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

Merge pull request #334 from awhitford/MavenPluginWarnings

Browse Source 
Removed deprecated code.
This commit is contained in:
Jeremy Long
2015-09-05 20:59:05 -04:00
parent 17a05cc1d4 d009e39842
commit c4c670a3b1
2 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dependency-check-maven/pom.xml
View File

@@ -291,15 +291,10 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.plugin-tools</groupId> <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId> <artifactId>maven-plugin-annotations</artifactId>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.reporting</groupId> <groupId>org.apache.maven.reporting</groupId>

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

@@ -30,15 +30,12 @@ import java.io.OutputStream;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.ArtifactVersion;
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;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReport;
@@ -82,13 +79,8 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
/** /**
* The Maven Project Object. * The Maven Project Object.
*/ */
@Component @Parameter(property = "project", required=true, readonly=true)
private MavenProject project; private MavenProject project;
/**
* The meta data source for retrieving artifact version information.
*/
@Component
private ArtifactMetadataSource metadataSource;
/** /**
* A reference to the local repository. * A reference to the local repository.
*/ */
@@ -476,32 +468,6 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(), getLog().debug(String.format("Adding project reference %s on dependency %s", project.getName(),
d.getDisplayFileName())); d.getDisplayFileName()));
} }
// //Removed - this was the start of tryinig to resolve issue #
// if (metadataSource != null) {
// try {
// final DependencyVersion currentVersion = new DependencyVersion(a.getVersion());
// final List<ArtifactVersion> versions = metadataSource.retrieveAvailableVersions(a,
// localRepository, remoteRepositories);
// for (ArtifactVersion av : versions) {
// final DependencyVersion newVersion = new DependencyVersion(av.toString());
// if (currentVersion.compareTo(newVersion) < 0) {
// d.addAvailableVersion(av.toString());
// }
// }
// } catch (ArtifactMetadataRetrievalException ex) {
// getLog().warn(
// "Unable to check for new versions of dependencies; see the log for more details.");
// if (getLog().isDebugEnabled()) {
// getLog().debug("", ex);
// }
// } catch (Throwable t) {
// getLog().warn(
// "Unexpected error occured checking for new versions; see the log for more details.");
// if (getLog().isDebugEnabled()) {
// getLog().debug("", t);
// }
// }
// }
} }
} else { } else {
if (getLog().isDebugEnabled()) { if (getLog().isDebugEnabled()) {