Repository: karaf Updated Branches: refs/heads/master 1d6fe287b -> f55d7cdf4
[KARAF-3251] Fix the karaf maven plugin to add conditional bundles to the distribution Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f55d7cdf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f55d7cdf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f55d7cdf Branch: refs/heads/master Commit: f55d7cdf4b03293b774d0e5b1e367842786d01e5 Parents: 1d6fe28 Author: Guillaume Nodet <gno...@gmail.com> Authored: Fri Oct 24 15:28:30 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Fri Oct 24 15:28:30 2014 +0200 ---------------------------------------------------------------------- .../karaf/tooling/features/InstallKarsMojo.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f55d7cdf/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 55e9914..0c35e98 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 @@ -395,16 +395,16 @@ 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 != null && !installedFeatures.contains(condition)) && (bootFeatures != null && !bootFeatures.contains(condition))) { - found = false; - break; - } - } - } - if (found) { +// boolean found = true; +// for (String condition : conditional.getCondition()) { +// if (!condition.startsWith("req:")) { +// if ((installedFeatures != null && !installedFeatures.contains(condition)) && (bootFeatures != null && !bootFeatures.contains(condition))) { +// found = false; +// break; +// } +// } +// } +// if (found) { getLog().info("= Installing conditional " + conditional.getCondition().toString()); getLog().debug("== Conditional features ..."); for (Dependency dependency : conditional.getFeature()) { @@ -422,7 +422,7 @@ public class InstallKarsMojo extends MojoSupport { for (ConfigFile configFile : conditional.getConfigfile()) { installConfigFile(configFile); } - } +// } } }
