[brooklyn-server] branch master updated: BROOKLYN-627: fix okhttp/kubernetes startup issue

[duncangrant]

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-server.git


The following commit(s) were added to refs/heads/master by this push:
     new afcd406  BROOKLYN-627: fix okhttp/kubernetes startup issue
     new ba7fb91  Merge pull request #1099 from aledsage/fix/BROOKLYN-627
afcd406 is described below

commit afcd40658dca4921c83ec1a8c589acf0590a33b9
Author: Aled Sage <aled.s...@gmail.com>
AuthorDate: Wed May 13 09:00:44 2020 +0100

    BROOKLYN-627: fix okhttp/kubernetes startup issue
---
 karaf/features/src/main/feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/karaf/features/src/main/feature/feature.xml 
b/karaf/features/src/main/feature/feature.xml
index 9157b1d..8ce7ecf 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -314,7 +314,7 @@
         <bundle 
dependency='true'>wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-SymbolicName=squareup-okio&amp;Bundle-Version=1.15.0&amp;Export-Package=okio;version=1.15.0</bundle>
         <!-- (3) -->
         <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3&amp;Bundle-Version=3.12.6&amp;Import-Package=okio;version=1.15,*;resolution:=optional</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6$Bundle-SymbolicName=squareup-okhttp3-logging-interceptor&amp;Bundle-Version=3.12.6&amp;Import-Package=*;resolution:=mandatory</bundle>
         <!-- (4) -->
         <!-- these are the main required bundles for these features above -->
         <bundle>mvn:io.fabric8/zjsonpatch/0.3.0</bundle>