[brooklyn-dist] 06/07: add more deps earlier in feature -- makes it start with no refreshes!

[he...@apache.org]

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

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git

commit 4c2945171b9200d73fe9c90870517ed42d1921c0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Sat Nov 13 09:08:30 2021 +0000

    add more deps earlier in feature -- makes it start with no refreshes!
---
 karaf/features/src/main/feature/feature.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 4881b1c..adae39e 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -25,15 +25,23 @@
 
     <feature name="brooklyn-standard-karaf" version="${project.version}" description="Karaf standard feature with RMI excluded">
         <feature>wrap</feature>
+
+        <bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>  <!-- from cxf but triggers jetty restart so load early -->
+        <feature>brooklyn-jsgui-prereqs</feature> <!-- provides jetty for pax-web-core which we want, and much more which doesn't hurt -->
+        <feature>pax-web-core</feature> <!-- provides objectweb 8.0.1 for aries-proxy -->
+        <feature>aries-proxy</feature> <!-- seems confused about objectweb; feature declares 9.0 but bundle wires optionally to 8.0.1 -->
+
         <feature>aries-blueprint</feature>
         <feature>shell</feature>
         <feature>shell-compat</feature>
         <feature>feature</feature>
         <feature>jaas</feature>
         <feature>ssh</feature>
+
         <!-- Don't load the feature as it opens ports protected by the default credentials -->
         <!-- Could alternatively reconfigure the feature to use more restricted realm, but we don't use this functionality anyway. -->
         <!-- feature>management</feature -->
+
         <feature>bundle</feature>
         <feature>config</feature>
         <feature>deployer</feature>
@@ -45,10 +53,6 @@
         <feature>package</feature>
         <feature>service</feature>
         <feature>system</feature>
-        
-        <!-- load BouncyCastle early, to avoid refreshing of org.apache.sshd.core later -->
-        <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
-        <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
     </feature>
 
     <feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to load early">