Index: tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
===================================================================
--- tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java (revision 988857)
+++ tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java (working copy)
@@ -34,10 +34,11 @@
expect(artifact.getGroupId()).andReturn("org.apache.karaf.test");
expect(artifact.getArtifactId()).andReturn("test-artifact");
expect(artifact.getVersion()).andReturn("1.2.3");
+ expect(artifact.getType()).andReturn("jar");
replay(artifact);
- assertEquals("org.apache.karaf.test/test-artifact/1.2.3", GenerateFeaturesXmlMojo.toString(artifact));
+ assertEquals("org.apache.karaf.test/test-artifact/1.2.3/jar", GenerateFeaturesXmlMojo.toString(artifact));
}
}
Index: tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
===================================================================
--- tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java (revision 988857)
+++ tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java (working copy)
@@ -507,7 +507,7 @@
}
public static String toString(Artifact artifact) {
- return String.format("%s/%s/%s", artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
+ return String.format("%s/%s/%s/%s", artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
}
private class Feature {
@@ -554,8 +554,8 @@
out.println(" " + String.format("%s", next.getArtifactId()));
} else {
- out.println(String.format(" mvn:%s/%s/%s",
- next.getGroupId(), next.getArtifactId(), next.getBaseVersion()));
+ out.println(String.format(" mvn:%s/%s/%s/%s",
+ next.getGroupId(), next.getArtifactId(), next.getBaseVersion(),next.getType()));
}
}
out.println(" ");