Improve Apache SSHD packaging

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index d7f50ae4d7e9ae729dfb8259d55b091653e6f320..b9c69dea3a34664cf4fdc1638c6feda3691786b2 100644 (file)
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -929,8 +929,8 @@ public class A2Factory {
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.osgi"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
-               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
+//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.gis"));
                System.exit(0);

diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd
index b8414e9d1cad2c22e4a198decaa650682108ea69..02377e2f679728aed3d0aaacd2dcdba314fde8cc 100644 (file)
--- a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd
+++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd
@@ -1,6 +1,11 @@
 Bundle-SymbolicName: org.apache.sshd.common
 Fragment-Host: org.apache.sshd.core
-Import-Package: org.bouncycastle.jce.provider;resolution:=optional,
-                                               net.i2p.crypto.eddsa;resolution:=optional,
-                                               *
+Import-Package: \
+org.bouncycastle.jce.provider.*;resolution:=optional,\
+net.i2p.crypto.eddsa.*;resolution:=optional,\
+org.slf4j,\
+org.slf4j.event,\
+org.slf4j.helpers,\
+*
+
 SLC-Origin-M2: org.apache.sshd:sshd-common

diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd
index 3ba3f50549844db95f7fdb79385e803a39128ecf..c3e183a3c238488dbabe2ae71c4427999a5f7e12 100644 (file)
--- a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd
+++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd
@@ -2,4 +2,5 @@ Bundle-SymbolicName: org.apache.sshd.core
 SLC-Origin-M2: org.apache.sshd:sshd-core
 Import-Package: \
 org.apache.tomcat.jni.*;resolution:=optional,\
+org.bouncycastle.crypto.prng,\
 *
\ No newline at end of file