Improve TP 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 985eae02097d6d2d5a3d1fdd268b05588d058652..674571057f6b062eff8167ae2fd3b0f883c14c39 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
@@ -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 (file)
index 0000000..ce57733
--- /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
deleted file mode 100644 (file)
index 02377e2..0000000
--- a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd
+++ /dev/null
@@ -1,11 +0,0 @@
-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,\
-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.common.bnd.retired b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd.retired
new file mode 100644 (file)
index 0000000..02377e2
--- /dev/null
+++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.common.bnd.retired
@@ -0,0 +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,\
+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
deleted file mode 100644 (file)
index c3e183a..0000000
--- a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-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

diff --git a/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired
new file mode 100644 (file)
index 0000000..c3e183a
--- /dev/null
+++ b/tp/org.argeo.tp.apache/apache-sshd/org.apache.sshd.core.bnd.retired
@@ -0,0 +1,6 @@
+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

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 9673968a527baec4b5af703ee632da2605bbc51e..9cc855d2c67d129409d3f7cbf6fe7191d3902101 100644 (file)
--- 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 f862a6b89628a395ee479e6c97764ee21f151703..2eea7649d0140ef8dc6611851896ef0ba0af9ef7 100644 (file)
--- 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", \
+*