[brooklyn-dist] branch master updated: Bump karaf version to 4.2.8 (from 4.2.7)

[du...@apache.org]

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 41f6238  Bump karaf version to 4.2.8 (from 4.2.7)
     new 5faaec0  Merge pull request #162 from aledsage/bump-karaf-version
41f6238 is described below

commit 41f6238b5a77b549988f361edc32ac2d76b7f28e
Author: Aled Sage <al...@gmail.com>
AuthorDate: Wed May 6 16:17:39 2020 +0100

    Bump karaf version to 4.2.8 (from 4.2.7)
---
 karaf/features/src/main/feature/feature.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 5ebc4ef..07d2ed5 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -50,9 +50,6 @@
         <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">