Removing the JSch agentproxy binding and the sshj agentproxy bundle
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/d8e6d286 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/d8e6d286 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/d8e6d286 Branch: refs/heads/use-servicemix-features Commit: d8e6d286bd03696a1e34be254dd2e16bf3ec277e Parents: 7291b01 Author: Andrew Phillips <[email protected]> Authored: Thu Apr 17 00:12:02 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Thu Apr 17 00:13:40 2014 -0400 ---------------------------------------------------------------------- feature/src/main/resources/feature.xml | 3 +-- pom.xml | 21 --------------------- 2 files changed, 1 insertion(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d8e6d286/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index 5d16a47..434b6be 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -434,8 +434,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> - <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>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> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d8e6d286/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 548a67b..8632882 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,6 @@ 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> @@ -462,30 +461,10 @@ 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> </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>
