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/1f1aceb8 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1f1aceb8 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1f1aceb8 Branch: refs/heads/1.9.x Commit: 1f1aceb89dd72f74f892cdafb47c0b1f44e0cd32 Parents: daf7980 Author: Guglielmo Nigri <[email protected]> Authored: Tue Nov 15 10:58:21 2016 +0100 Committer: Andrea Turli <[email protected]> Committed: Fri Nov 18 16:11:54 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/1f1aceb8/drivers/okhttp/pom.xml ---------------------------------------------------------------------- diff --git a/drivers/okhttp/pom.xml b/drivers/okhttp/pom.xml index 9db31cf..6eefc29 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/1f1aceb8/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index f69dfbc..77f4bf0 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>
