From faf53767301d2258e3322a728a3cec4b76d02235 Mon Sep 17 00:00:00 2001
From: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Date: Tue, 20 Sep 2016 14:34:44 +0300
Subject: [PATCH] Upgrade to Karaf 4.0.6

Reorders loading order - rest-resources after karaf-init as it depends on the ManagementContext service
---
 karaf/features/src/main/feature/feature.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 7547d0d82f..e00c829472 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -60,15 +60,15 @@
         <feature prerequisite="true">brooklyn-guava-optional-deps</feature>
         <feature>brooklyn-core</feature>
         <feature>brooklyn-locations-jclouds</feature>
-        <feature>brooklyn-rest-resources</feature>
         <feature>brooklyn-commands</feature>
         <feature>brooklyn-server-software-all</feature>
         <feature>brooklyn-library-all</feature>
+        <feature>brooklyn-rest-resources-prereqs</feature>
+        <feature>brooklyn-jsgui-prereqs</feature>
     </feature>
 
     <feature name="brooklyn-jsgui-prereqs" version="${project.version}" description="Brooklyn REST JavaScript Web GUI">
         <feature>pax-jetty</feature> <!-- jaas bundle -->
-        <bundle>mvn:org.apache.brooklyn/brooklyn-karaf-jetty-config/${project.version}</bundle>
         <feature>war</feature>
     </feature>
 
@@ -79,8 +79,10 @@
 
     <feature name="brooklyn-boot" version="${project.version}" description="Bundles to start on boot">
         <feature prerequisite="true">brooklyn-headless</feature>
-        <feature prerequisite="true">brooklyn-jsgui</feature>
+        <bundle>mvn:org.apache.brooklyn/brooklyn-karaf-jetty-config/${project.version}</bundle>
         <feature>brooklyn-osgi-launcher</feature>
+        <feature>brooklyn-jsgui</feature>
+        <feature>brooklyn-rest-resources</feature>
     </feature>
 
 </features>