karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject karaf git commit: [KARAF-4632] Default serviceRequirements should handle 1.4.0 schema
Date Fri, 22 Jul 2016 10:33:29 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x deca12754 -> 5c5828322


[KARAF-4632] Default serviceRequirements should handle 1.4.0 schema

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5c582832
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5c582832
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5c582832

Branch: refs/heads/karaf-4.0.x
Commit: 5c5828322ad898e80e66923edeb29e1a25b774cb
Parents: deca127
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Fri Jul 22 12:33:17 2016 +0200
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Fri Jul 22 12:33:17 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/karaf/features/internal/region/Subsystem.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/5c582832/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 39ef12f..7d7b4bf 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
@@ -376,7 +376,8 @@ 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());
+            removeServiceRequirements = !FeaturesNamespaces.URI_1_3_0.equals(feature.getNamespace())
+                                     && !FeaturesNamespaces.URI_1_4_0.equals(feature.getNamespace());
         } else {
             removeServiceRequirements = false;
         }


Mime
View raw message