Author: jdcasey
Date: Wed Nov 23 08:11:42 2005
New Revision: 348473
URL: http://svn.apache.org/viewcvs?rev=348473&view=rev
Log:
PR: MNG-1416
Submitted By: John Casey
Prevent the artifact collector from firing an inclusion event when the node is
disabled. In this case, the node will not be included in any subsequent
classpath, so firing an inclusion/selection event is incorrect.
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/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=348473&r1=348472&r2=348473&view=diff
==============================================================================
---
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
Wed Nov 23 08:11:42 2005
@@ -214,7 +214,10 @@
}
previousNodes.add( node );
- fireEvent( ResolutionListener.INCLUDE_ARTIFACT, listeners, node );
+ if ( node.isActive() )
+ {
+ fireEvent( ResolutionListener.INCLUDE_ARTIFACT, listeners, node );
+ }
// don't pull in the transitive deps of a system-scoped dependency.
if ( node.isActive() && !Artifact.SCOPE_SYSTEM.equals(
node.getArtifact().getScope() ) )
