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/04/02 03:13:52 UTC
[1/2] git commit: JCLOUDS-516: Adding agentproxy dependencies for
jclouds-services feature
Repository: jclouds-karaf
Updated Branches:
refs/heads/JCLOUDS-511-1.7.x a74229666 -> 866aaa921 (forced update)
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/afae47d6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/afae47d6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/afae47d6
Branch: refs/heads/JCLOUDS-511-1.7.x
Commit: afae47d6c640c960d0038e61aec99ed2215755f5
Parents: 176deec
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Apr 1 11:02:21 2014 +0200
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Apr 2 03:12:04 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/afae47d6/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index 8e7f5fc..8b1c5d2 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -435,6 +435,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/afae47d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd4ec9f..904d23c 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>
@@ -466,13 +467,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>
[2/2] git commit: JCLOUDS-511: Correcting features with
dependency-only bundles
Posted by an...@apache.org.
JCLOUDS-511: Correcting features with dependency-only bundles
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/866aaa92
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/866aaa92
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/866aaa92
Branch: refs/heads/JCLOUDS-511-1.7.x
Commit: 866aaa921593e936cb66db8ca9a0125daa389798
Parents: afae47d
Author: Grzegorz Grzybek <gg...@redhat.com>
Authored: Mon Mar 24 17:04:57 2014 +0100
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Apr 2 03:13:09 2014 +0200
----------------------------------------------------------------------
feature/src/main/resources/feature.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/866aaa92/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index 8b1c5d2..9270964 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -132,13 +132,12 @@ limitations under the License.
<feature name="jclouds-api-rackspace-cloudidentity" description="Rackspace Cloud Identity API" version="${project.version}" resolver="(obr)">
<feature version='${project.version}'>jclouds-compute</feature>
<feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
- <bundle dependency='true'>mvn:org.apache.jclouds.api/rackspace-cloudidentity/${jclouds.version}</bundle>
+ <bundle>mvn:org.apache.jclouds.api/rackspace-cloudidentity/${jclouds.version}</bundle>
</feature>
<feature name="jclouds-api-rackspace-clouddns" description="Rackspace Cloud DNS API" version="${project.version}" resolver="(obr)">
<feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
- <bundle dependency='true'>mvn:org.apache.jclouds.api/rackspace-clouddns/${jclouds.version}</bundle>
-
+ <bundle>mvn:org.apache.jclouds.api/rackspace-clouddns/${jclouds.version}</bundle>
</feature>
<feature name="jclouds-api-chef" description="Jclouds - API - Chef" version="${project.version}" resolver="(obr)">