KARAF-440: features-maven-plugin:validate throws NPE in Maven 3
git-svn-id: https://svn.apache.org/repos/asf/karaf/branches/karaf-2.1.x@1068928 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
index 27bcf75..d728c1a 100644
--- a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
+++ b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
@@ -39,6 +39,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.DefaultArtifactCollector;
@@ -76,6 +77,15 @@
private DependencyTreeBuilder dependencyTreeBuilder;
/**
+ * The ArtifactCollector provided by Maven at runtime
+ *
+ * @component
+ * @required
+ * @readonly
+ */
+ private ArtifactCollector collector;
+
+ /**
* The file to generate
*
* @parameter default-value="${project.build.directory}/classes/features.xml"
@@ -220,7 +230,7 @@
return true;
}
- }, new DefaultArtifactCollector());
+ }, collector);
tree.accept(new DependencyNodeVisitor() {
public boolean endVisit(DependencyNode node) {
// we want the next sibling too
