Remove the need to hack the code each time a new feature namespace is defined
@@ -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;
}
