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 2017/02/28 15:57:48 UTC

karaf git commit: Support "karaf" classifier in addition of "features" in the assembly goal.

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x b00bd088d -> 49e9f9891


Support "karaf" classifier in addition of "features" in the assembly goal.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/49e9f989
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/49e9f989
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/49e9f989

Branch: refs/heads/karaf-4.0.x
Commit: 49e9f9891f35852c38e47073179350219721e462
Parents: b00bd08
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Tue Feb 28 18:49:01 2017 +0800
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Feb 28 16:57:41 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/karaf/tooling/AssemblyMojo.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/49e9f989/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index 9ba2c22..ff56c9d 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@ -348,7 +348,7 @@ public class AssemblyMojo extends MojoSupport {
                 case Boot:      bootKars.add(uri); break;
                 case Installed: installedKars.add(uri); break;
                 }
-            } else if ("features".equals(artifact.getClassifier())) {
+            } else if ("features".equals(artifact.getClassifier()) || "karaf".equals(artifact.getClassifier())) {
                 String uri = artifactToMvn(artifact);
                 switch (stage) {
                 case Startup:   startupRepositories.add(uri); break;