Repository: jclouds-karaf Updated Branches: refs/heads/master b21a33582 -> 094f698f7
JCLOUDS-516: Adding agentproxy dependencies for jclouds-services feature Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/094f698f Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/094f698f Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/094f698f Branch: refs/heads/master Commit: 094f698f7e0c557bbdb8bfb4075dd9eb7fac2874 Parents: b21a335 Author: Andrew Phillips <[email protected]> Authored: Tue Apr 1 11:02:21 2014 +0200 Committer: Andrew Phillips <[email protected]> Committed: Wed Apr 2 03:10:36 2014 +0200 ---------------------------------------------------------------------- feature/src/main/resources/feature.xml | 6 ++++++ pom.xml | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/094f698f/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index 246326c..9270964 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -434,6 +434,12 @@ 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: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> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.bundle.version}</bundle> <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bcprov.version}</bundle> <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bcprov.version}</bundle> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/094f698f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 984d1bd..807b21e 100644 --- a/pom.xml +++ b/pom.xml @@ -200,6 +200,7 @@ limitations under the License. <jersey.bundle.version>1.11_1</jersey.bundle.version> <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> <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> @@ -457,13 +458,30 @@ limitations under the License. <artifactId>jzlib</artifactId> <version>${jzlib.version}</version> </dependency> + + <!-- JSch agentproxy --> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.connector-factory</artifactId> + <version>${jsch.agentproxy.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.usocket-nc</artifactId> + <version>${jsch.agentproxy.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.sshagent</artifactId> + <version>${jsch.agentproxy.version}</version> + </dependency> + <!-- Logging Dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId>
