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/01 23:36:22 UTC
[1/2] git commit: Adding sshagent as another dep for the agentproxy
Repository: jclouds-karaf
Updated Branches:
refs/heads/JCLOUDS-516-bundle-fix 64f8d0731 -> fe921b353
Adding sshagent as another dep for the agentproxy
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/ed0fe787
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/ed0fe787
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/ed0fe787
Branch: refs/heads/JCLOUDS-516-bundle-fix
Commit: ed0fe78700eca7a5c250b25b869a8cd4876cb617
Parents: 64f8d07
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Apr 1 15:32:17 2014 +0200
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Apr 1 15:32:17 2014 +0200
----------------------------------------------------------------------
feature/src/main/resources/feature.xml | 5 +++--
pom.xml | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/ed0fe787/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index 68fcb07..126bc57 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -435,9 +435,10 @@ limitations under the License.
<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 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>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.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/ed0fe787/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d0e457b..773734a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,6 +472,11 @@ limitations under the License.
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy.sshagent</artifactId>
+ <version>${jsch.agentproxy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
<version>${jsch.agentproxy.version}</version>
</dependency>
[2/2] git commit: Not including the wrapped bundles as
dependency='true'
Posted by an...@apache.org.
Not including the wrapped bundles as dependency='true'
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/fe921b35
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/fe921b35
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/fe921b35
Branch: refs/heads/JCLOUDS-516-bundle-fix
Commit: fe921b3538b03d50660be90c61dd75fe1e174484
Parents: ed0fe78
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Apr 1 15:32:38 2014 +0200
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Apr 1 23:35:31 2014 +0200
----------------------------------------------------------------------
pom.xml | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fe921b35/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 773734a..4dd8cf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,16 +462,6 @@ limitations under the License.
<!-- JSch agentproxy -->
<dependency>
<groupId>com.jcraft</groupId>
- <artifactId>jsch.agentproxy.jsch</artifactId>
- <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.sshagent</artifactId>
<version>${jsch.agentproxy.version}</version>
</dependency>