You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/11/14 12:51:23 UTC
[1/2] brooklyn-server git commit: Fix dependency URI path for
downstream projects + Karaf feature verification
Repository: brooklyn-server
Updated Branches:
refs/heads/master f84eed7bc -> aafe43d56
Fix dependency URI path for downstream projects + Karaf feature verification
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8960aab0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8960aab0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8960aab0
Branch: refs/heads/master
Commit: 8960aab0f11cd7d1983f85d7c0be14e6e9bcc988
Parents: 9b24f7d
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Mon Nov 14 12:17:05 2016 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Mon Nov 14 12:17:05 2016 +0000
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8960aab0/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 e7cd848..3e6bb8f 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -256,7 +256,7 @@
https://github.com/square/okhttp/pull/2246
-->
<!-- TODO use ServiceMix bundle for okhttp when dependency on okio is fixed there -->
- <bundle dependency="true">wrap:mvn:com.squareup.okhttp/okhttp/2.2.0$Import-Package=org.apache.http.*;resolution:=optional,android.util.*;resolution:=optional,okio;version="[1.2.0, 1.3.0)",*</bundle>
+ <bundle dependency="true">wrap:mvn:com.squareup.okhttp/okhttp/2.2.0$Import-Package=org.apache.http.*;resolution:=optional,android.util.*;resolution:=optional,okio;version=%27[1.2.0,1.3.0)%27,*</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.2.0_1</bundle>
<bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle>
[2/2] brooklyn-server git commit: This closes #433
Posted by al...@apache.org.
This closes #433
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/aafe43d5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/aafe43d5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/aafe43d5
Branch: refs/heads/master
Commit: aafe43d568d7bc7ffdb7e5a13ffcd945e7c789b9
Parents: f84eed7 8960aab
Author: Aled Sage <al...@gmail.com>
Authored: Mon Nov 14 12:51:00 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Nov 14 12:51:00 2016 +0000
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------