Repository: brooklyn-server Updated Branches: refs/heads/master e947e929a -> ad5b4751f
Temporary workaround until jclouds-karaf catches up jclouds-karaf uses an older version (0.3) of java-xmlbuilder from the one in jclouds (1.1). Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1c205710 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1c205710 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1c205710 Branch: refs/heads/master Commit: 1c2057100e764e0d75d0b2c878087841aed00ec4 Parents: e947e92 Author: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Authored: Mon Sep 12 16:44:43 2016 +0300 Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Committed: Mon Sep 12 16:44:43 2016 +0300 ---------------------------------------------------------------------- karaf/features/src/main/feature/feature.xml | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1c205710/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 bea75a6..e84bc3f 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -246,6 +246,9 @@ </feature> <feature name="brooklyn-locations-jclouds" version="${project.version}" description="Brooklyn Jclouds Location Targets"> + <!-- Override jclouds provided 0.3_1 dependency - jclouds already depends on 1.1, but jclouds-karaf is not updated yet. --> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/1.1_1</bundle> + <!-- OkHttp had OSGi support shortly in 3.0.0, but was immediately reverted in 3.0.1 https://github.com/square/okhttp/pull/2192
