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 <[email protected]> Authored: Mon Apr 14 19:51:00 2014 -0400 Committer: Andrew Phillips <[email protected]> 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>
