From 7d4562c6447d59259e84449e138e3b458cbd9774 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Mar 2023 16:55:38 +0100
Subject: [PATCH] Move Apache SSHD to org.argoe.tp

---
 .../org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd  | 1 -
 .../org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd  | 1 -
 .../org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd | 1 -
 repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd | 1 +
 repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd    | 1 +
 .../apache-sshd/common.bnd                                   | 0
 .../apache-sshd/merge.bnd                                    | 4 ++--
 repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd   | 5 +++++
 .../apache-sshd/org.apache.sshd.git.bnd                      | 2 ++
 .../apache-sshd/org.apache.sshd.putty.bnd                    | 2 ++
 repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd   | 5 +++++
 repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd  | 5 +++++
 .../org.apache.tomcat.jni.bnd                                | 0
 sdk/argeo-build                                              | 2 +-
 sdk/output-argeo-tp-minimal.target                           | 1 -
 15 files changed, 24 insertions(+), 7 deletions(-)
 delete mode 100644 repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.cli.bnd
 delete mode 100644 repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd
 delete mode 100644 repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.sftp.bnd
 rename repackage/{org.argeo.tp.crypto => org.argeo.tp}/apache-sshd/common.bnd (100%)
 rename repackage/{org.argeo.tp.crypto => org.argeo.tp}/apache-sshd/merge.bnd (79%)
 create mode 100644 repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd
 rename repackage/{org.argeo.tp.crypto => org.argeo.tp}/apache-sshd/org.apache.sshd.git.bnd (75%)
 rename repackage/{org.argeo.tp.crypto => org.argeo.tp}/apache-sshd/org.apache.sshd.putty.bnd (68%)
 create mode 100644 repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd
 create mode 100644 repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd
 rename repackage/{org.argeo.tp.crypto => org.argeo.tp}/org.apache.tomcat.jni.bnd (100%)

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
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.scp.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.scp.bnd
deleted file mode 100644
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
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.utils/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
index ce7b768..3dc17b1 100644
--- 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 c23c836..98dd4d6 100644
--- 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.crypto/apache-sshd/common.bnd b/repackage/org.argeo.tp/apache-sshd/common.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/apache-sshd/common.bnd
rename to repackage/org.argeo.tp/apache-sshd/common.bnd
diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd b/repackage/org.argeo.tp/apache-sshd/merge.bnd
similarity index 79%
rename from repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd
rename to repackage/org.argeo.tp/apache-sshd/merge.bnd
index 4b3620d..b8ab9a6 100644
--- a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd
+++ b/repackage/org.argeo.tp/apache-sshd/merge.bnd
@@ -4,8 +4,8 @@ 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,\
+org.bouncycastle.crypto.prng;resolution:=optional,\
+org.bouncycastle.*;resolution:=optional,\
 net.i2p.crypto.eddsa.*;resolution:=optional,\
 org.slf4j,\
 org.slf4j.event,\
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
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.crypto/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
similarity index 75%
rename from repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd
rename to repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
index 33aadcf..d4eec3c 100644
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.git.bnd
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
@@ -1,5 +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.crypto/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
similarity index 68%
rename from repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd
rename to repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
index c10ecea..67671b2 100644
--- a/repackage/org.argeo.tp.crypto/apache-sshd/org.apache.sshd.putty.bnd
+++ b/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
@@ -1,4 +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
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
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.crypto/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd
rename to repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 948d50f..949c81c 160000
--- 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 1d96d16..b15e79b 100644
--- 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>
-- 
2.30.2