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/23 07:56:03 UTC
[3/4] git commit: Using ServiceMix bundle for jsch-agentproxy-sshj
Using ServiceMix bundle for jsch-agentproxy-sshj
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/2f30d531
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/2f30d531
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/2f30d531
Branch: refs/heads/1.8.x
Commit: 2f30d531bcfb044aeeecd167e27f06ce9bf2b72d
Parents: b8d341c
Author: Andrew Phillips <an...@apache.org>
Authored: Sun May 4 21:12:50 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Sat Oct 18 16:35:31 2014 -0400
----------------------------------------------------------------------
feature/src/main/resources/feature.xml | 3 +--
pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/2f30d531/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index ec55bbc..afbc3f8 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -386,8 +386,7 @@ 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 a usable bundle - see https://issues.apache.org/jira/browse/SMX4-1749 -->
- <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: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/2f30d531/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbc4cf9..bd2db8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,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}_2</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>
@@ -462,6 +463,11 @@ 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>com.jcraft</groupId>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
<version>${jsch.agentproxy.version}</version>