[karaf] branch karaf-4.2.x updated: [KARAF-6836] Use default start level for bundles in the subsystem feature

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new aa4c97e  [KARAF-6836] Use default start level for bundles in the 
subsystem feature
aa4c97e is described below

commit aa4c97e59ee4dd9a8e5ecd54e7355a3374defa77
Author: jbonofre <jbono...@apache.org>
AuthorDate: Wed Sep 2 21:52:02 2020 +0200

    [KARAF-6836] Use default start level for bundles in the subsystem feature
    
    (cherry picked from commit 279381c92c41a1aebc81034539a131cfc69ccfd7)
---
 assemblies/features/enterprise/src/main/feature/feature.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml 
b/assemblies/features/enterprise/src/main/feature/feature.xml
index 105a0ab..0bd81df 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -272,11 +272,11 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
         <details>Support for Aries OSGi subsystems</details>
         <bundle dependency="true" 
start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
         <bundle dependency="true" 
start-level="30">mvn:org.apache.karaf.services/org.apache.karaf.services.coordinator/${project.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.api/${aries.subsystem.api.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.core/${aries.subsystem.core.version}</bundle>
+        
<bundle>mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.api/${aries.subsystem.api.version}</bundle>
+        
<bundle>mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.core/${aries.subsystem.core.version}</bundle>
         <conditional>
             <condition>shell</condition>
-            <bundle 
start-level="30">mvn:org.apache.karaf.subsystem/org.apache.karaf.subsystem.core/${project.version}</bundle>
+            
<bundle>mvn:org.apache.karaf.subsystem/org.apache.karaf.subsystem.core/${project.version}</bundle>
         </conditional>
     </feature>