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/29 04:18:28 UTC
[1/2] git commit: Cleaning up jsch dependencies
Repository: jclouds
Updated Branches:
refs/heads/master e18409195 -> ae8b7636d
Cleaning up jsch dependencies
- Moving jsch dep to the driver
- 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/58bd4da7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/58bd4da7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/58bd4da7
Branch: refs/heads/master
Commit: 58bd4da7939f68080346fb53ae533954fdba89b1
Parents: e184091
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 23:15:39 2014 -0400
----------------------------------------------------------------------
drivers/jsch/pom.xml | 1 +
project/pom.xml | 9 ++-------
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/58bd4da7/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/58bd4da7/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index ab4d2e3..661f2ce 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>
@@ -517,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>
[2/2] git commit: Moving Guava version config into
Posted by an...@apache.org.
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 <an...@apache.org>
Authored: Tue Oct 28 10:34:09 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
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: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>
@@ -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>