You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/28 19:53:53 UTC
[1/4] git commit: Consolidating dependency versions
Repository: jclouds
Updated Branches:
refs/heads/dep-cleanup [created] 95beb6711
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/6c22a383
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6c22a383
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6c22a383
Branch: refs/heads/dep-cleanup
Commit: 6c22a383960dd55205a2efff734bafb5d857992c
Parents: e184091
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Oct 28 10:34:09 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Oct 28 14:52:19 2014 -0400
----------------------------------------------------------------------
project/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6c22a383/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index ab4d2e3..4be7e0f 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: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>
@@ -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>
[2/4] git commit: Moving jsch dep to the driver
Posted by an...@apache.org.
Moving jsch dep to the driver
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a2eb59b5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a2eb59b5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a2eb59b5
Branch: refs/heads/dep-cleanup
Commit: a2eb59b5001f150d237959eb59d8868134d9fd84
Parents: 6c22a38
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Oct 28 10:34:57 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Oct 28 14:52:20 2014 -0400
----------------------------------------------------------------------
drivers/jsch/pom.xml | 1 +
project/pom.xml | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a2eb59b5/drivers/jsch/pom.xml
----------------------------------------------------------------------
diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml
index 22b2dbc..6aabe35 100644
--- a/drivers/jsch/pom.xml
+++ b/drivers/jsch/pom.xml
@@ -84,6 +84,7 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
+ <version>0.1.49</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a2eb59b5/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 4be7e0f..bb0614d 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -224,11 +224,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.49</version>
- </dependency>
- <dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>${clojure.version}</version>
[4/4] git commit: Moving Guava version config into
Posted by an...@apache.org.
Moving Guava version config into <dependencyManagement>
Allows for overriding in modules that inherit from core also.
Follow-up to c426e7e
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/95beb671
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/95beb671
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/95beb671
Branch: refs/heads/dep-cleanup
Commit: 95beb671188afa2c11e8875a11d3eb8a9b3e2e6f
Parents: 6b8d2be
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Oct 28 10:37:20 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Oct 28 14:52:22 2014 -0400
----------------------------------------------------------------------
core/pom.xml | 1 -
project/pom.xml | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/95beb671/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/95beb671/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index e7831e0..becf9c7 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -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>
[3/4] git commit: Updating jsch.agentproxy version in conflicting dep
list
Posted by an...@apache.org.
Updating jsch.agentproxy version in conflicting dep list
Follow-up to b3882cb
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6b8d2be8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6b8d2be8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6b8d2be8
Branch: refs/heads/dep-cleanup
Commit: 6b8d2be81504d98e203ff309fb5536671de85ad6
Parents: a2eb59b
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Oct 28 10:36:00 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Oct 28 14:52:21 2014 -0400
----------------------------------------------------------------------
project/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6b8d2be8/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index bb0614d..e7831e0 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -512,12 +512,12 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.core</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
</conflictingDependencies>
<packages>