From 662c2fe3747449332542d95a474a2d35a3be4f88 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 10 Jul 2022 12:59:15 +0200 Subject: [PATCH] Improve TP packaging --- .../src/org/argeo/slc/factory/A2Factory.java | 8 ++++++-- tp/org.argeo.tp.apache/apache-sshd/merge.bnd | 16 ++++++++++++++++ ...on.bnd => org.apache.sshd.common.bnd.retired} | 0 ...core.bnd => org.apache.sshd.core.bnd.retired} | 0 .../org.graalvm.nativeimage.svm.bnd | 2 +- tp/org.argeo.tp/net.i2p.crypto.eddsa.bnd | 3 +++ 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 tp/org.argeo.tp.apache/apache-sshd/merge.bnd rename tp/org.argeo.tp.apache/apache-sshd/{org.apache.sshd.common.bnd => org.apache.sshd.common.bnd.retired} (100%) rename tp/org.argeo.tp.apache/apache-sshd/{org.apache.sshd.core.bnd => org.apache.sshd.core.bnd.retired} (100%) 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 985eae020..674571057 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 @@ -333,6 +333,10 @@ public class A2Factory { continue entries; else if (entry.getName().equals("META-INF/LICENSE-notice.md")) continue entries; + else if (entry.getName().equals("META-INF/DEPENDENCIES")) + continue entries; + if (entry.getName().startsWith(".cache/")) // Apache SSHD + continue entries; Path target = targetBundleDir.resolve(entry.getName()); Files.createDirectories(target.getParent()); if (!Files.exists(target)) { @@ -1017,7 +1021,7 @@ public class A2Factory { A2Factory factory = new A2Factory(factoryBase, descriptorsBase, true); // factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd")); -// factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd")); + factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd")); // factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.osgi")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp")); @@ -1026,7 +1030,7 @@ public class A2Factory { // 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(1); + System.exit(1); // SDK factory.processCategory(Paths.get("org.argeo.tp.sdk")); diff --git a/tp/org.argeo.tp.apache/apache-sshd/merge.bnd b/tp/org.argeo.tp.apache/apache-sshd/merge.bnd new file mode 100644 index 000000000..ce577336d --- /dev/null +++ b/tp/org.argeo.tp.apache/apache-sshd/merge.bnd @@ -0,0 +1,16 @@ +Bundle-License: Apache-2.0 +Bundle-SymbolicName: org.apache.sshd +SLC-Origin-M2: :2.8.0 +Export-Package: org.apache.* +Import-Package: \ +org.apache.tomcat.jni.*;resolution:=optional,\ +org.bouncycastle.crypto.prng,\ +org.bouncycastle.jce.provider.*;resolution:=optional,\ +net.i2p.crypto.eddsa.*;resolution:=optional,\ +org.slf4j,\ +org.slf4j.event,\ +org.slf4j.helpers,\ +* +SLC-Origin-M2-Merge: \ +org.apache.sshd:sshd-core, \ +org.apache.sshd:sshd-common 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.retired similarity index 100% rename from tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd rename to tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd.retired 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.retired similarity index 100% rename from tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd rename to tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired diff --git a/tp/org.argeo.tp.sdk/org.graalvm.nativeimage.svm.bnd b/tp/org.argeo.tp.sdk/org.graalvm.nativeimage.svm.bnd index 9673968a5..9cc855d2c 100644 --- a/tp/org.argeo.tp.sdk/org.graalvm.nativeimage.svm.bnd +++ b/tp/org.argeo.tp.sdk/org.graalvm.nativeimage.svm.bnd @@ -1,4 +1,4 @@ Bundle-License: GPL-2.0-only WITH Classpath-exception-2.0 SLC-Origin-M2: org.graalvm.nativeimage:svm:22.1.0.1 # Workaround for errors in Eclipse PDE when using GraalVM as JCM -Import-Package: java.*;resolution:="optional", * \ No newline at end of file +Import-Package: *;resolution:="optional" \ No newline at end of file diff --git a/tp/org.argeo.tp/net.i2p.crypto.eddsa.bnd b/tp/org.argeo.tp/net.i2p.crypto.eddsa.bnd index f862a6b89..2eea7649d 100644 --- a/tp/org.argeo.tp/net.i2p.crypto.eddsa.bnd +++ b/tp/org.argeo.tp/net.i2p.crypto.eddsa.bnd @@ -1,2 +1,5 @@ Bundle-License: CC0-1.0 SLC-Origin-M2: net.i2p.crypto:eddsa:0.3.0 +Import-Package: \ +sun.*;resolution:="optional", \ +* -- 2.39.2