You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2016/12/02 15:06:36 UTC
[2/4] brooklyn-server git commit: Upgrade guava to v18.0
Upgrade guava to v18.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e2411eee
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e2411eee
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e2411eee
Branch: refs/heads/master
Commit: e2411eee0d10b3fab55971388d34afc3642eee36
Parents: bfaaa90
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Dec 2 15:43:13 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Dec 2 15:43:13 2016 +0200
----------------------------------------------------------------------
pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e2411eee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5edf93..d77f65d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,8 +95,12 @@
<logback.version>1.0.7</logback.version>
<slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
<!-- Must match jclouds' version. From jclouds 1.9.3+ can be any version in the range [16-20) -->
- <guava.version>16.0.1</guava.version>
- <!-- This can be different, OSGi will pick it up -->
+ <guava.version>18.0</guava.version>
+ <!--
+ This can be different from above and should be used only by Swagger related code.
+ Note that some bundles used by Brooklyn will try to bind to the latest version available.
+ For example jclouds and jackson-datatype-guava both depend on guava [16,20).
+ -->
<guava-swagger.version>18.0</guava-swagger.version>
<xstream.version>1.4.8</xstream.version>
<xpp3.servicemix.version>1.1.4c_7</xpp3.servicemix.version>