Repository: jclouds Updated Branches: refs/heads/master 95c401198 -> 5a3cfe5db
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. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5a3cfe5d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5a3cfe5d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5a3cfe5d Branch: refs/heads/master Commit: 5a3cfe5dbe5398ee6c81a21a279363c3caa51728 Parents: 95c4011 Author: Guglielmo Nigri <[email protected]> Authored: Tue Nov 15 10:58:21 2016 +0100 Committer: Andrea Turli <[email protected]> Committed: Fri Nov 18 16:05:52 2016 +0100 ---------------------------------------------------------------------- drivers/okhttp/pom.xml | 2 +- project/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/5a3cfe5d/drivers/okhttp/pom.xml ---------------------------------------------------------------------- diff --git a/drivers/okhttp/pom.xml b/drivers/okhttp/pom.xml index 7be5feb..8e9eef9 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> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5a3cfe5d/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 163625f..00ad82e 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -226,6 +226,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>
