Repository: karaf Updated Branches: refs/heads/master fe6eba9bd -> 1b1b94497
[KARAF-5082] Remove the need to hack the code each time a new feature namespace is defined Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1b1b9449 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1b1b9449 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1b1b9449 Branch: refs/heads/master Commit: 1b1b94497465e22a274b7b28f49bfde6067b2054 Parents: fe6eba9 Author: Guillaume Nodet <[email protected]> Authored: Thu May 11 10:07:29 2017 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu May 11 10:08:31 2017 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/features/internal/region/Subsystem.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/1b1b9449/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java index b38a76d..c1bfdc7 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java @@ -388,8 +388,10 @@ public class Subsystem extends ResourceImpl { if (FeaturesService.SERVICE_REQUIREMENTS_DISABLE.equals(serviceRequirements)) { removeServiceRequirements = true; } else if (feature != null && FeaturesService.SERVICE_REQUIREMENTS_DEFAULT.equals(serviceRequirements)) { - removeServiceRequirements = !FeaturesNamespaces.URI_1_3_0.equals(feature.getNamespace()) - && !FeaturesNamespaces.URI_1_4_0.equals(feature.getNamespace()); + removeServiceRequirements = FeaturesNamespaces.URI_1_0_0.equals(feature.getNamespace()) + || FeaturesNamespaces.URI_1_1_0.equals(feature.getNamespace()) + || FeaturesNamespaces.URI_1_2_0.equals(feature.getNamespace()) + || FeaturesNamespaces.URI_1_2_1.equals(feature.getNamespace()); } else { removeServiceRequirements = false; }
