svn commit: r548799 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java

[markh]

Author: markh
Date: Tue Jun 19 09:54:44 2007
New Revision: 548799

URL: http://svn.apache.org/viewvc?view=rev&rev=548799
Log:
Merging r548797 from 2.0.x:

Make DefaultArtifactCollector fire OMIT_FOR_NEARER events to listeners even if 
the artifact versions do not differ.  This allows interested listeners to be 
able to track omitted duplicate artifacts.

Modified:
    
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java

Modified: 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?view=diff&rev=548799&r1=548798&r2=548799
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
 Tue Jun 19 09:54:44 2007
@@ -484,12 +484,7 @@
                     listener.includeArtifact( node.getArtifact() );
                     break;
                 case ResolutionListener.OMIT_FOR_NEARER:
-                    String version = node.getArtifact().getVersion();
-                    String replacementVersion = replacement.getVersion();
-                    if ( version != null ? !version.equals( replacementVersion 
) : replacementVersion != null )
-                    {
-                        listener.omitForNearer( node.getArtifact(), 
replacement );
-                    }
+                    listener.omitForNearer( node.getArtifact(), replacement );
                     break;
                 case ResolutionListener.OMIT_FOR_CYCLE:
                     listener.omitForCycle( node.getArtifact() );