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 2014/09/25 21:38:53 UTC
git commit: Fix features condition support in install-kar goal
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 77fa6967d -> 2ea914381
Fix features condition support in install-kar goal
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2ea91438
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2ea91438
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2ea91438
Branch: refs/heads/karaf-3.0.x
Commit: 2ea914381197fc5f1ec986c052fcf2fba1a29502
Parents: 77fa696
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Sep 25 21:38:33 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Sep 25 21:38:33 2014 +0200
----------------------------------------------------------------------
.../apache/karaf/tooling/features/InstallKarsMojo.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2ea91438/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
index b1ea605..068ae4b 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
@@ -396,12 +396,10 @@ public class InstallKarsMojo extends MojoSupport {
// installing condition features
for (Conditional conditional : feature.getConditional()) {
boolean found = true;
- for (String condition : conditional.getCondition()) {
- if (!condition.startsWith("req:")) {
- if (!installedFeatures.contains(condition) && !bootFeatures.contains(condition)) {
- found = false;
- break;
- }
+ for (Dependency condition : conditional.getCondition()) {
+ if (!installedFeatures.contains(condition.getName()) && !bootFeatures.contains(condition.getName())) {
+ found = false;
+ break;
}
}
if (found) {