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/04/15 18:54:46 UTC
[1/2] git commit: JCLOUDS-534: Upgrade to Guava 17.0-rc2
Repository: jclouds-karaf
Updated Branches:
refs/heads/use-servicemix-features 000bfa448 -> 0ad4b51a7 (forced update)
JCLOUDS-534: Upgrade to Guava 17.0-rc2
Release notes:
https://code.google.com/p/guava-libraries/wiki/Release17
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/73265cd8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/73265cd8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/73265cd8
Branch: refs/heads/use-servicemix-features
Commit: 73265cd8c066f035ec2428eb7cc1e1e54edba0af
Parents: 6a6a45e
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Apr 14 18:35:04 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Apr 14 18:35:45 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/73265cd8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14ceef8..c4b8a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@ limitations under the License.
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<groovy.version>1.8.6</groovy.version>
<gson.version>2.2.2</gson.version>
- <guava.version>16.0.1</guava.version>
+ <guava.version>17.0-rc2</guava.version>
<guava.test.version>10.0</guava.test.version>
<guice.version>3.0</guice.version>
<httpclient.version>4.1.1</httpclient.version>
[2/2] git commit: Using ServiceMix bundles for JSch and sshj
agentproxy deps
Posted by an...@apache.org.
Using ServiceMix bundles for JSch and sshj agentproxy deps
Follow-up to 094f698f. See
* https://issues.apache.org/jira/browse/SMX4-1728
* https://issues.apache.org/jira/browse/SMX4-1729
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/0ad4b51a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/0ad4b51a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/0ad4b51a
Branch: refs/heads/use-servicemix-features
Commit: 0ad4b51a7c90ab64f1fc883a9be40e9bf8102939
Parents: 73265cd
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Apr 14 19:51:00 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Apr 15 12:45:59 2014 -0400
----------------------------------------------------------------------
feature/src/main/resources/feature.xml | 5 ++---
pom.xml | 11 +++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/0ad4b51a/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index 9270964..5d16a47 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -434,9 +434,8 @@ limitations under the License.
<feature version='${project.version}'>jclouds-blobstore</feature>
<feature version='${project.version}'>jclouds-management</feature>
<bundle dependency='true'>mvn:net.schmizz/sshj/${sshj.version}</bundle>
- <!-- not currently available as bundles - see https://issues.apache.org/jira/browse/SMX4-1728 and SMX4-1729 -->
- <bundle>wrap:mvn:com.jcraft/jsch.agentproxy.jsch/${jsch.agentproxy.version}</bundle>
- <bundle>wrap:mvn:com.jcraft/jsch.agentproxy.sshj/${jsch.agentproxy.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-jsch/${jsch.agentproxy.bundle.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.connector-factory/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.usocket-nc/${jsch.agentproxy.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.sshagent/${jsch.agentproxy.version}</bundle>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/0ad4b51a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c4b8a53..c5422de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,6 +201,7 @@ limitations under the License.
<joda.version>2.1</joda.version>
<jsch.bundle.version>0.1.44_2</jsch.bundle.version>
<jsch.agentproxy.version>0.0.7</jsch.agentproxy.version>
+ <jsch.agentproxy.bundle.version>${jsch.agentproxy.version}_1</jsch.agentproxy.bundle.version>
<jsr305.bundle.version>1.3.9_1</jsr305.bundle.version>
<sericemix.specs.jsr250.version>1.9.0</sericemix.specs.jsr250.version>
<junit.version>4.8.2</junit.version>
@@ -461,6 +462,16 @@ limitations under the License.
<!-- JSch agentproxy -->
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-sshj</artifactId>
+ <version>${jsch.agentproxy.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-jsch</artifactId>
+ <version>${jsch.agentproxy.bundle.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
<version>${jsch.agentproxy.version}</version>