brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] brooklyn-server git commit: Use servicemix bundle for okio
Date Thu, 10 Nov 2016 18:54:09 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master b072cbe55 -> dff428e52


Use servicemix bundle for okio

 - servicemix okio version 1.2.0_1
 - still wrap: okhttp 2.2.0 but with explicit dependency on okio 1.2.x bundle


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

Branch: refs/heads/master
Commit: bdc9d939c0933d9e28db4d5a066427dabb8462d3
Parents: 70f2950
Author: Guglielmo Nigri <guglielmo.nigri@cloudsoftcorp.com>
Authored: Thu Nov 10 17:31:53 2016 +0100
Committer: Guglielmo Nigri <guglielmo.nigri@cloudsoftcorp.com>
Committed: Thu Nov 10 17:51:49 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bdc9d939/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 d22037c..e7cd848 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -255,8 +255,9 @@
             https://github.com/square/okhttp/issues/2243
             https://github.com/square/okhttp/pull/2246
         -->
-        <bundle dependency="true">wrap:mvn:com.squareup.okhttp/okhttp/2.2.0</bundle>
-        <bundle dependency="true">wrap:mvn:com.squareup.okio/okio/1.2.0</bundle>
+        <!-- TODO use ServiceMix bundle for okhttp when dependency on okio is fixed there
-->
+        <bundle dependency="true">wrap:mvn:com.squareup.okhttp/okhttp/2.2.0$Import-Package=org.apache.http.*;resolution:=optional,android.util.*;resolution:=optional,okio;version="[1.2.0,
1.3.0)",*</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.2.0_1</bundle>
         <bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle>
 
         <bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>


Mime
View raw message