You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/10/21 15:10:07 UTC
svn commit: r1400638 - in
/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency:
AbstractAnalyzeMojo.java AnalyzeReportMojo.java
Author: hboutemy
Date: Sun Oct 21 13:10:07 2012
New Revision: 1400638
URL: http://svn.apache.org/viewvc?rev=1400638&view=rev
Log:
removed duplicate code, which is now shared in maven-dependency-analyzer
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java?rev=1400638&r1=1400637&r2=1400638&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java Sun Oct 21 13:10:07 2012
@@ -205,25 +205,15 @@ public abstract class AbstractAnalyzeMoj
throw new MojoExecutionException( "Cannot analyze dependencies", exception );
}
- Set<Artifact> usedDeclared = analysis.getUsedDeclaredArtifacts();
- Set<Artifact> usedUndeclared = analysis.getUsedUndeclaredArtifacts();
- Set<Artifact> unusedDeclared = analysis.getUnusedDeclaredArtifacts();
-
if ( ignoreNonCompile )
{
- Set<Artifact> filteredUnusedDeclared = new HashSet<Artifact>( unusedDeclared );
- Iterator<Artifact> iter = filteredUnusedDeclared.iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- if ( !artifact.getScope().equals( Artifact.SCOPE_COMPILE ) )
- {
- iter.remove();
- }
- }
- unusedDeclared = filteredUnusedDeclared;
+ analysis = analysis.ignoreNonCompile();
}
+ Set<Artifact> usedDeclared = analysis.getUsedDeclaredArtifacts();
+ Set<Artifact> usedUndeclared = analysis.getUsedUndeclaredArtifacts();
+ Set<Artifact> unusedDeclared = analysis.getUnusedDeclaredArtifacts();
+
if ( ( !verbose || usedDeclared.isEmpty() ) && usedUndeclared.isEmpty() && unusedDeclared.isEmpty() )
{
getLog().info( "No dependency problems found" );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=1400638&r1=1400637&r2=1400638&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java Sun Oct 21 13:10:07 2012
@@ -124,21 +124,7 @@ public class AnalyzeReportMojo
//remove everything that's not in the compile scope
if ( ignoreNonCompile )
{
- Set<Artifact> filteredUnusedDeclared = new HashSet<Artifact>( analysis.getUnusedDeclaredArtifacts() );
- Iterator<Artifact> iter = filteredUnusedDeclared.iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = iter.next();
- if ( !artifact.getScope().equals( Artifact.SCOPE_COMPILE ) )
- {
- iter.remove();
- }
- }
-
- ProjectDependencyAnalysis analysisTemp =
- new ProjectDependencyAnalysis( analysis.getUsedDeclaredArtifacts(),
- analysis.getUsedUndeclaredArtifacts(), filteredUnusedDeclared );
- analysis = analysisTemp;
+ analysis = analysis.ignoreNonCompile();
}
// Step 2: Create sink and bundle