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:16 UTC
[1/2] karaf git commit: Support "karaf" classifier in addition of
"features" in the assembly goal.
Repository: karaf
Updated Branches:
refs/heads/master 3f72cea08 -> 9ce8fb53b
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/d2956e10
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d2956e10
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d2956e10
Branch: refs/heads/master
Commit: d2956e104a0c60f4c2206139f28cedec73e4d898
Parents: 3f72cea
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:56:14 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/d2956e10/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 2450411..a2d2418 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
@@ -409,7 +409,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;
[2/2] karaf git commit: This closes #288
Posted by jb...@apache.org.
This closes #288
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ce8fb53
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ce8fb53
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ce8fb53
Branch: refs/heads/master
Commit: 9ce8fb53b9cd6b2d78d4f687a390ebaabdcdf73f
Parents: 3f72cea d2956e1
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Tue Feb 28 16:57:04 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Tue Feb 28 16:57:04 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/tooling/AssemblyMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------