Repository: jclouds-karaf Updated Branches: refs/heads/JCLOUDS-516-bundle-fix 06a3a3bb9 -> 64f8d0731
Now wrapping jsch-agent-proxy-jsch and -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/64f8d073 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/64f8d073 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/64f8d073 Branch: refs/heads/JCLOUDS-516-bundle-fix Commit: 64f8d073148e0f63043da69f3ba2df391cc0fadc Parents: 06a3a3b Author: Andrew Phillips <[email protected]> Authored: Tue Apr 1 13:57:37 2014 +0200 Committer: Andrew Phillips <[email protected]> Committed: Tue Apr 1 13:57:37 2014 +0200 ---------------------------------------------------------------------- feature/src/main/resources/feature.xml | 4 +++- pom.xml | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/64f8d073/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index 0e99719..68fcb07 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -434,7 +434,9 @@ 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> - <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.core/${jsch.agentproxy.version}</bundle> + <!-- not currently available as bundles - see https://issues.apache.org/jira/browse/SMX4-1728 and SMX4-1729 --> + <bundle dependency='true'>wrap:mvn:com.jcraft/jsch.agentproxy.jsch/${jsch.agentproxy.version}</bundle> + <bundle dependency='true'>wrap:mvn:com.jcraft/jsch.agentproxy.jsch/${jsch.agentproxy.version}</bundle> <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.connector-factory/${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> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/64f8d073/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bc127d9..d0e457b 100644 --- a/pom.xml +++ b/pom.xml @@ -463,12 +463,17 @@ limitations under the License. <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.jsch</artifactId> - <version>0.0.7</version> + <version>${jsch.agentproxy.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.sshj</artifactId> + <version>${jsch.agentproxy.version}</version> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> - <version>0.0.7</version> + <version>${jsch.agentproxy.version}</version> </dependency> <!-- Logging Dependencies -->
