brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] brooklyn-dist git commit: Upgrade to Karaf 4.0.6
Date Wed, 01 Feb 2017 09:56:46 GMT
Repository: brooklyn-dist
Updated Branches:
  refs/heads/master b2fd61f35 -> 4ca0bc2cd


Upgrade to Karaf 4.0.6

Reorders loading order - rest-resources after karaf-init as it depends on the ManagementContext
service


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/faf53767
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/faf53767
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/faf53767

Branch: refs/heads/master
Commit: faf53767301d2258e3322a728a3cec4b76d02235
Parents: 5ea1a89
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Tue Sep 20 14:34:44 2016 +0300
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Wed Jan 4 15:26:58 2017 +0200

----------------------------------------------------------------------
 karaf/features/src/main/feature/feature.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/faf53767/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 7547d0d..e00c829 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>


Mime
View raw message