You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2007/06/19 18:53:15 UTC
svn commit: r548797 -
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Author: markh
Date: Tue Jun 19 09:53:10 2007
New Revision: 548797
URL: http://svn.apache.org/viewvc?view=rev&rev=548797
Log:
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/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?view=diff&rev=548797&r1=548796&r2=548797
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Tue Jun 19 09:53:10 2007
@@ -479,12 +479,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() );
Re: svn commit: r548797 - /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Posted by Mark Hobson <ma...@gmail.com>.
On 20/06/07, Brett Porter <br...@apache.org> wrote:
> Can you change the logger to detect this and not re-report? This will
> make -X output obscenely long (as if it wasn't already :)
Good catch - committed in both 2.0.x and trunk.
Cheers,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r548797 - /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Posted by Brett Porter <br...@apache.org>.
Can you change the logger to detect this and not re-report? This will
make -X output obscenely long (as if it wasn't already :)
- Brett
On 20/06/2007, at 2:53 AM, markh@apache.org wrote:
> Author: markh
> Date: Tue Jun 19 09:53:10 2007
> New Revision: 548797
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=548797
> Log:
> 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/branches/maven-2.0.x/maven-artifact/src/main/
> java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
>
> Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/
> main/java/org/apache/maven/artifact/resolver/
> DefaultArtifactCollector.java
> URL: http://svn.apache.org/viewvc/maven/components/branches/
> maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/
> resolver/DefaultArtifactCollector.java?
> view=diff&rev=548797&r1=548796&r2=548797
> ======================================================================
> ========
> --- maven/components/branches/maven-2.0.x/maven-artifact/src/main/
> java/org/apache/maven/artifact/resolver/
> DefaultArtifactCollector.java (original)
> +++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/
> java/org/apache/maven/artifact/resolver/
> DefaultArtifactCollector.java Tue Jun 19 09:53:10 2007
> @@ -479,12 +479,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() );
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org