Move Apache SSHD to org.argoe.tp

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd
deleted file mode 100644 (file)
index 9aacdb5..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.9.2
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd
deleted file mode 100644 (file)
index 4b3620d..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Bundle-SymbolicName: org.apache.sshd
-Argeo-Origin-M2: :2.9.2
-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,\
-*
-Argeo-Origin-M2-Merge: \
-org.apache.sshd:sshd-core, \
-org.apache.sshd:sshd-common

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd
deleted file mode 100644 (file)
index 4295806..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.sshd:sshd-cli

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd
deleted file mode 100644 (file)
index 33aadcf..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Argeo-Origin-M2: org.apache.sshd:sshd-git
-Import-Package: \
-org.eclipse.jgit.*;resolution:=optional,\
-org.kohsuke.*;resolution:=optional,\
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd
deleted file mode 100644 (file)
index c10ecea..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Argeo-Origin-M2: org.apache.sshd:sshd-putty
-Import-Package: \
-net.i2p.*;resolution:=optional,\
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd
deleted file mode 100644 (file)
index 83e6b9f..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.sshd:sshd-scp

diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd
deleted file mode 100644 (file)
index aa6f671..0000000
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.sshd:sshd-sftp

diff --git a/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd
deleted file mode 100644 (file)
index e54669a..0000000
--- a/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11
-Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.72
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
index ce7b76805162510a56a6316e10e40ce8d8e77475..3dc17b1986e35db7d216af66911242e29ade17bc 100644 (file)
--- a/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
+++ b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
@@ -2,4 +2,5 @@ SPDX-License-Identifier: LGPL-2.1-only
 Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.30
 Import-Package: \
 com.ibm.icu.*;resolution:=optional,\
+org.bouncycastle.*;resolution:="optional",\
 *
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd
index c23c83642091a1ceef71ff75db0a25bd9fbd2bd9..98dd4d697585538d55a8f1aac5cf1364f53e2f18 100644 (file)
--- a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd
+++ b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd
@@ -1,4 +1,5 @@
 Argeo-Origin-M2: org.apache.pdfbox:pdfbox
 Import-Package: \
 sun.java2d.cmm.kcms;resolution:="optional",\
+org.bouncycastle.*;resolution:="optional",\
 *
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/apache-sshd/common.bnd b/repackage/org.argeo.tp/apache-sshd/common.bnd
new file mode 100644 (file)
index 0000000..9aacdb5
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.9.2
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/apache-sshd/merge.bnd b/repackage/org.argeo.tp/apache-sshd/merge.bnd
new file mode 100644 (file)
index 0000000..b8ab9a6
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/merge.bnd
@@ -0,0 +1,16 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.sshd
+Argeo-Origin-M2: :2.9.2
+Export-Package: org.apache.*
+Import-Package: \
+org.apache.tomcat.jni.*;resolution:=optional,\
+org.bouncycastle.crypto.prng;resolution:=optional,\
+org.bouncycastle.*;resolution:=optional,\
+net.i2p.crypto.eddsa.*;resolution:=optional,\
+org.slf4j,\
+org.slf4j.event,\
+org.slf4j.helpers,\
+*
+Argeo-Origin-M2-Merge: \
+org.apache.sshd:sshd-core, \
+org.apache.sshd:sshd-common

diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd
new file mode 100644 (file)
index 0000000..ec35e33
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.apache.sshd:sshd-cli
+
+Import-Package: \
+org.bouncycastle.*;resolution:=optional,\
+*

diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
new file mode 100644 (file)
index 0000000..d4eec3c
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
@@ -0,0 +1,7 @@
+Argeo-Origin-M2: org.apache.sshd:sshd-git
+
+Import-Package: \
+org.bouncycastle.*;resolution:=optional,\
+org.eclipse.jgit.*;resolution:=optional,\
+org.kohsuke.*;resolution:=optional,\
+*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
new file mode 100644 (file)
index 0000000..67671b2
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
@@ -0,0 +1,6 @@
+Argeo-Origin-M2: org.apache.sshd:sshd-putty
+
+Import-Package: \
+org.bouncycastle.*;resolution:=optional,\
+net.i2p.*;resolution:=optional,\
+*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd
new file mode 100644 (file)
index 0000000..b1c94d8
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.apache.sshd:sshd-scp
+
+Import-Package: \
+org.bouncycastle.*;resolution:=optional,\
+*

diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd
new file mode 100644 (file)
index 0000000..43fc2e4
--- /dev/null
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.apache.sshd:sshd-sftp
+
+Import-Package: \
+org.bouncycastle.*;resolution:=optional,\
+*

diff --git a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
new file mode 100644 (file)
index 0000000..e54669a
--- /dev/null
+++ b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: Apache-2.0
+# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11
+Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.72
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 948d50f9792c1984eb055e58b8199f5778df901f..949c81c657e02d1dde8a83f5651000f39db53b4d 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 948d50f9792c1984eb055e58b8199f5778df901f
+Subproject commit 949c81c657e02d1dde8a83f5651000f39db53b4d

diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target
index 1d96d16aad30beceb268a966152d3e1a83ddd6ad..b15e79bb161d83212c0b6a9b3a7e6ee05a76749b 100644 (file)
--- a/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@ -5,7 +5,6 @@
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.crypto" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
        </locations>