This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push: new a7a29e0 Fix some karaf startup slowness new ca276f2 Merge pull request #161 from aledsage/fix-karaf-startup-bundle-refreshes a7a29e0 is described below commit a7a29e0e691dc3e4a79afc8f4c76b65cb11a3803 Author: Aled Sage <aled.s...@gmail.com> AuthorDate: Fri May 1 17:49:51 2020 +0100 Fix some karaf startup slowness Bundles are stopped / refreshed due to the order that bundles are being added. This fixes some of those problems. --- karaf/features/src/main/feature/feature.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index ccae9dd..5ebc4ef 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -45,9 +45,14 @@ <feature>package</feature> <feature>service</feature> <feature>system</feature> - <!-- load BouncyCastle early, to avoid refreshing of org.apache.sshd.core/0.14.0 later --> + + <!-- load BouncyCastle/eddsa early, to avoid refreshing of org.apache.sshd.core later --> + <bundle dependency="true">mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle> <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle> <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle> + + <!-- load spifly early as otherwise jetty and pax-jetty load 1.2.2 and 1.2 respectively, which weirdly causes bundles refreshes --> + <bundle start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spifly.version}</bundle> </feature> <feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to add to startup.properties">