From ecc9e9f087c1754c2f8268e7f2f28f29a32da6b7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Jul 2022 06:00:23 +0200 Subject: [PATCH] Improve Apache SSHD packaging --- .../src/org/argeo/slc/factory/A2Factory.java | 4 ++-- .../apache-sshd/org.apache.sshd.common.bnd | 11 ++++++++--- .../apache-sshd/org.apache.sshd.core.bnd | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) 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 d7f50ae4d..b9c69dea3 100644 --- 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 b8414e9d1..02377e2f6 100644 --- 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 3ba3f5054..c3e183a3c 100644 --- 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 -- 2.30.2