[brooklyn-server] 13/28: split up jclouds deps, and add some addl ones needed

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 6564e71aca8a7a204eddcf80f83761ad0403225d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Nov 9 15:31:15 2021 +0000

    split up jclouds deps, and add some addl ones needed
    
    still not quite working though
---
 karaf/features/pom.xml                      |  9 ++++++++
 karaf/features/src/main/feature/feature.xml | 35 +++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index 0bac569..80a8d6a 100755
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -31,6 +31,15 @@
     <name>Brooklyn Karaf Features</name>
     <packaging>pom</packaging>
 
+    <properties>
+      <jsch.version>0.1.55</jsch.version>
+      <jsch.bundle.version>${jsch.version}_1</jsch.bundle.version>
+      <jsch.agentproxy.version>0.0.9</jsch.agentproxy.version>
+      <jsch.agentproxy.bundle.version>${jsch.agentproxy.version}_1</jsch.agentproxy.bundle.version>
+      <jzlib.version>1.0.7</jzlib.version>
+      <jzlib.bundle.version>${jzlib.version}_1</jzlib.bundle.version>
+    </properties>
+
     <build>
         <resources>
             <resource>
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index e6420f7..ce50a27 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -276,14 +276,39 @@
 
     <feature name="brooklyn-locations-jclouds" version="${project.version}" description="Brooklyn Jclouds Location Targets">
         <feature>brooklyn-core</feature>
+        <feature>jclouds-feature-brooklyn</feature>
+
+        <bundle start-level="85">mvn:org.apache.brooklyn/brooklyn-locations-jclouds/${project.version}</bundle>
+        <feature>brooklyn-software-winrm</feature>
+        <feature>brooklyn-locations-jclouds-labs</feature>
+    </feature>
+
+    <feature name="jclouds-feature-brooklyn" version="${project.version}" description="Jclouds and Dependencies">
+        <!-- upstreams which seem needed -->
+        <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-SymbolicName=squareup-okio&amp;Bundle-Version=1.15.0&amp;Export-Package=okio;version=1.15.0</bundle>
+        <!-- (3) -->
+        <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3&amp;Bundle-Version=3.12.6&amp;Import-Package=okio;version=1.15,*;resolution:=optional</bundle>
+        <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6$Bundle-SymbolicName=squareup-okhttp3-logging-interceptor&amp;Bundle-Version=3.12.6&amp;Import-Package=*;resolution:=mandatory</bundle>
 
         <!-- upstream dependencies, needed -->
-        <bundle>mvn:com.google.inject/guice/${guice.version}</bundle>
-        <bundle>mvn:com.google.inject.extensions/guice-assistedinject/${guice.version}</bundle>
-        <bundle>mvn:com.google.inject.extensions/guice-multibindings/${guice.version}</bundle>
+        <bundle dependency='true'>mvn:com.google.inject/guice/${guice.version}</bundle>
+        <bundle dependency='true'>mvn:com.google.inject.extensions/guice-assistedinject/${guice.version}</bundle>
+        <bundle dependency='true'>mvn:com.google.inject.extensions/guice-multibindings/${guice.version}</bundle>
         <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson.version}</bundle>
         <bundle dependency='true'>mvn:com.google.guava/guava/${guava.version}</bundle>
 
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle>
+        <bundle dependency="true">mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle>
+        <bundle dependency="true">mvn:com.hierynomus/sshj/${sshj.version}</bundle>
+        <!-- <bundle dependency='true'>mvn:org.apache.jclouds.karaf.bundles/jsch-agentproxy-jsch/${project.version}</bundle> -->
+        <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.core/${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.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle>
+ 
+
         <!-- upstream dependencies, maybe not needed --> 
         <bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_1</bundle>
@@ -352,10 +377,6 @@
 <!--    exclude vcac; not available in 2.4.0, and not widely used or tested.
         <bundle>mvn:org.apache.jclouds.labs/vcac/${jclouds.version}</bundle>
 -->
-
-        <bundle start-level="85">mvn:org.apache.brooklyn/brooklyn-locations-jclouds/${project.version}</bundle>
-        <feature>brooklyn-software-winrm</feature>
-        <feature>brooklyn-locations-jclouds-labs</feature>
     </feature>
 
     <feature name="brooklyn-locations-jclouds-labs" version="${project.version}" description="Brooklyn JClouds Labs Location Targets">