From 87f98299ac72e1b7299d41231aa2a0d4239b6f2c Mon Sep 17 00:00:00 2001 From: Mark Hobson Date: Thu, 21 Jun 2007 15:21:49 +0000 Subject: [PATCH] Merged r549509 from 2.0.x: Update OMIT_FOR_NEARER event to correctly reflect which node was actually omitted. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549510 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/artifact/resolver/DefaultArtifactCollector.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java index 417178bad1..fc12a58781 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java @@ -229,12 +229,13 @@ public class DefaultArtifactCollector // if we need to update scope of nearest to use farthest scope, use the nearest version, but farthest scope nearest.disable(); farthest.getArtifact().setVersion( nearest.getArtifact().getVersion() ); + fireEvent( ResolutionListener.OMIT_FOR_NEARER, listeners, nearest, farthest.getArtifact() ); } else { farthest.disable(); + fireEvent( ResolutionListener.OMIT_FOR_NEARER, listeners, farthest, nearest.getArtifact() ); } - fireEvent( ResolutionListener.OMIT_FOR_NEARER, listeners, farthest, nearest.getArtifact() ); } } }