You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/04/25 09:57:12 UTC
svn commit: r1096429 -
/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
Author: jbonofre
Date: Mon Apr 25 07:57:12 2011
New Revision: 1096429
URL: http://svn.apache.org/viewvc?rev=1096429&view=rev
Log:
[KARAF-504] Features Maven Plugin does not work with Maven 3.
Modified:
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
Modified: karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java?rev=1096429&r1=1096428&r2=1096429&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java (original)
+++ karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java Mon Apr 25 07:57:12 2011
@@ -43,6 +43,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.InvalidArtifactRTException;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ResolutionGroup;
+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;
@@ -80,6 +81,15 @@ public class GenerateFeaturesXmlMojo ext
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/feature.xml"
@@ -197,7 +207,7 @@ public class GenerateFeaturesXmlMojo ext
return true;
}
- }, new DefaultArtifactCollector());
+ }, collector);
tree.accept(new DependencyNodeVisitor() {
public boolean endVisit(DependencyNode node) {
// we want the next sibling too