From 5229ec2230f7a0480e481d1961d063b2e7a2a53c Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrewp@apache.org>
Date: Tue, 28 Oct 2014 10:34:09 -0400
Subject: [PATCH] Moving Guava version config into <dependencyManagement>

- Follow-up to c426e7e: allows overriding of the Guava version
  in modules that inherit from core
- Also consolidating dependency versions
---
 core/pom.xml    |  1 -
 project/pom.xml | 17 +++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 00ea842ec2..3b9589c740 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,7 +95,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
diff --git a/project/pom.xml b/project/pom.xml
index 899ac0ca49..0a5a1eaade 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -186,11 +186,16 @@
   </developers>
 
   <properties>
-    <clojure.version>1.3.0</clojure.version>
     <maven.compile.source>1.6</maven.compile.source>
     <maven.compile.target>1.6</maven.compile.target>
     <maven.compile.deprecation>true</maven.compile.deprecation>
     <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
+    <clojure.version>1.3.0</clojure.version>
+    <guava.version>17.0</guava.version>
+    <okhttp.version>1.6.0</okhttp.version>
+    <surefire.version>2.17</surefire.version>
+    <assertj-core.version>1.6.1</assertj-core.version>
+    <assertj-guava.version>1.2.0</assertj-guava.version>
     <http.proxyHost />
     <http.proxyPort />
     <jclouds.wire.httpstream.url>http://archive.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.tar.gz</jclouds.wire.httpstream.url>
@@ -200,11 +205,6 @@
     <jclouds.test.listener>org.jclouds.test.testng.UnitTestStatusListener</jclouds.test.listener>
     <test.ssh.keyfile />
     <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
-    <guava.version>17.0</guava.version>
-    <okhttp.version>1.6.0</okhttp.version>
-    <surefire.version>2.17</surefire.version>
-    <assertj-core.version>1.6.1</assertj-core.version>
-    <assertj-guava.version>1.2.0</assertj-guava.version>
   </properties>
 
   <dependencyManagement>
@@ -224,6 +224,11 @@
         <artifactId>core.incubator</artifactId>
         <version>0.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymockclassextension</artifactId>