Revert "[KARAF-4255] Only include conditional dependencies in assembly if condition is met"

This reverts commit 8ba5776.

Author: jbonofre

profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java

@@ -763,12 +763,10 @@ private void installStage(Profile installedProfile, Set<Feature> allBootFeatures
                 }
             }
             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 @@ private Set<Feature> bootStage(Profile bootProfile, Profile startupEffective) th
                 }
             }
             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 @@ private Set<Feature> bootStage(Profile bootProfile, Profile startupEffective) th
                 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 @@ private Set<Feature> bootStage(Profile bootProfile, Profile startupEffective) th
         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())) {