Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Guglielmo Nigri 2016-11-15 10:58:21 +01:00 committed by Andrea Turli
parent daf7980d73
commit 1f1aceb89d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/okhttp/pom.xml
View File

@ -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>

1
project/pom.xml
View File

@ -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>