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
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ae8b7636 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ae8b7636 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ae8b7636 Branch: refs/heads/master Commit: ae8b7636dffe55bab79e7c6b097fcdaf7d0a914e Parents: 58bd4da Author: Andrew Phillips <[email protected]> Authored: Tue Oct 28 10:34:09 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Tue Oct 28 23:16:19 2014 -0400 ---------------------------------------------------------------------- core/pom.xml | 1 - project/pom.xml | 17 +++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/ae8b7636/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index fa7280f..fb8f86d 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> http://git-wip-us.apache.org/repos/asf/jclouds/blob/ae8b7636/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 661f2ce..becf9c7 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -200,11 +200,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:[email protected]/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> @@ -214,11 +219,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> @@ -239,6 +239,11 @@ <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> <version>3.1</version>
