From 1f1aceb89dd72f74f892cdafb47c0b1f44e0cd32 Mon Sep 17 00:00:00 2001
From: Guglielmo Nigri <guglielmo.nigri@cloudsoftcorp.com>
Date: Tue, 15 Nov 2016 10:58:21 +0100
Subject: [PATCH] Fix okio version range for jclouds-okhttp

OSGi bundle for jclouds-okhttp should import okio package with correct
version range.
Currently, there is no version range specified, causing it to be wired
to a higher version than intended in complex environments that have more
than one bundle for okio installed.
---
 drivers/okhttp/pom.xml | 2 +-
 project/pom.xml        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/okhttp/pom.xml b/drivers/okhttp/pom.xml
index 9db31cf285..6eefc29145 100644
--- a/drivers/okhttp/pom.xml
+++ b/drivers/okhttp/pom.xml
@@ -33,7 +33,7 @@
 
   <properties>
     <jclouds.osgi.export>org.jclouds.http.okhttp*;version="${project.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+    <jclouds.osgi.import>org.jclouds*;version="${project.version}",${okio.osgi.import},*</jclouds.osgi.import>
   </properties>
 
   <dependencies>
diff --git a/project/pom.xml b/project/pom.xml
index f69dfbc550..77f4bf09e0 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -209,6 +209,7 @@
     <guava.osgi.import>com.google.common.*;version="[16.0.1,20.0.0)"</guava.osgi.import>
     <guice.version>3.0</guice.version>
     <okhttp.version>2.2.0</okhttp.version>
+    <okio.osgi.import>okio;version="[1.2.0,1.3)"</okio.osgi.import>
     <surefire.version>2.17</surefire.version>
     <assertj-core.version>1.7.0</assertj-core.version>
     <assertj-guava.version>1.3.0</assertj-guava.version>