Repository: karaf Updated Branches: refs/heads/master 62f538fc1 -> e4fa62540
Revert "[KARAF-4255] Only include conditional dependencies in assembly if condition is met" This reverts commit 8ba57764837cce11a660a97dfacde6716fba5998. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e4fa6254 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e4fa6254 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e4fa6254 Branch: refs/heads/master Commit: e4fa6254051a96b8c3128d02f649cf2ed279f086 Parents: 62f538f Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Apr 4 15:57:56 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Apr 4 15:57:56 2016 +0200 ---------------------------------------------------------------------- .../apache/karaf/profile/assembly/Builder.java | 35 +++++--------------- 1 file changed, 9 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e4fa6254/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java index 2ec866c..5efe378 100644 --- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java +++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java @@ -763,12 +763,10 @@ public class Builder { } } for (Conditional cond : feature.getConditional()) { - if (isConditionalMet(cond, installedFeatures)) { - for (Bundle bundle : cond.getBundle()) { - if (!ignoreDependencyFlag || !bundle.isDependency()) { - installArtifact(downloader, bundle.getLocation().trim()); - } - } + for (Bundle bundle : cond.getBundle()) { + if (!ignoreDependencyFlag || !bundle.isDependency()) { + installArtifact(downloader, bundle.getLocation().trim()); + } } } } @@ -834,11 +832,9 @@ public class Builder { } } for (Conditional cond : feature.getConditional()) { - if (isConditionalMet(cond, bootFeatures)) { - for (Bundle bundle : cond.getBundle()) { - if (!ignoreDependencyFlag || !bundle.isDependency()) { - locations.add(bundle.getLocation().trim()); - } + for (Bundle bundle : cond.getBundle()) { + if (!ignoreDependencyFlag || !bundle.isDependency()) { + locations.add(bundle.getLocation().trim()); } } } @@ -871,10 +867,8 @@ public class Builder { installArtifact(downloader, configFile.getLocation().trim()); } for (Conditional cond : feature.getConditional()) { - if (isConditionalMet(cond, bootFeatures)) { - for (ConfigFile configFile : cond.getConfigfile()) { - installArtifact(downloader, configFile.getLocation().trim()); - } + for (ConfigFile configFile : cond.getConfigfile()) { + installArtifact(downloader, configFile.getLocation().trim()); } } // Install libraries @@ -945,17 +939,6 @@ public class Builder { return allBootFeatures; } - private boolean isConditionalMet(Conditional cond, Set<Feature> bootFeatures) { - for (String condition : cond.getCondition()) { - for (Feature feature : bootFeatures) { - if (feature.getName().equals(condition)) { - return true; - } - } - } - return false; - } - private String getRepos(Features rep) { StringBuilder repos = new StringBuilder(); for (String repo : new HashSet<>(rep.getRepository())) {
