Move JTS to base TP. Add Jetty EE10, HTTP3. Move SSHD to own category.

diff --git a/repackage/Makefile b/repackage/Makefile
index d48c6a4c3f6cefb1d7b8ff71ec73c77c36e7f9c8..37eb377944b79506879afe5744944eda62403b64 100644 (file)
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -2,13 +2,13 @@ include ../sdk.mk
 
 # Minimal third-parties for running headless Argeo CMS
 CATEGORIES_CMS=\
-osgi/equinox/org.argeo.tp.osgi \
 org.argeo.tp \
 org.argeo.tp.httpd \
 crypto/fips/org.argeo.tp.crypto \
+org.argeo.tp.sshd \
+osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 
-
 CATEGORIES=\
 $(CATEGORIES_CMS) \
 org.argeo.tp.sys \

diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index 9b0ac9cbe28c202923febfd29bd72ea3ed94c5b7..d85d0daf48737ac18cf22531e4b45ea7da659a43 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
+++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
@@ -1,6 +1,7 @@
 Bundle-SymbolicName: org.eclipse.jetty.websocket
 SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
 Argeo-Origin-M2: :12.0.4
+# TODO split ee8 and ee10 ?
 Argeo-Origin-M2-Merge: \
 org.eclipse.jetty.websocket:jetty-websocket-core-client, \
 org.eclipse.jetty.websocket:jetty-websocket-core-common, \
@@ -9,10 +10,16 @@ org.eclipse.jetty.websocket:jetty-websocket-jetty-api, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-client, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-common, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-server,\
+org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet, \
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client, \
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common, \
 org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server,\
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet, \
+org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-server, \
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server,\
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server, \
 
 Export-Package: org.eclipse.jetty.*
 

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd
new file mode 100644 (file)
index 0000000..bf2d413
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.ee10:jetty-ee10-servlet
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled
deleted file mode 100644 (file)
index 05e48ec..0000000
--- a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty.ee8:jetty-ee8-server
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd
new file mode 100644 (file)
index 0000000..4eab154
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:jetty-http2-client-transport
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd
new file mode 100644 (file)
index 0000000..a4686e5
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-client
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd
new file mode 100644 (file)
index 0000000..3c6c6fb
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-client-transport
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd
new file mode 100644 (file)
index 0000000..b267f17
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-common
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd
new file mode 100644 (file)
index 0000000..9758836
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-qpack
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd
new file mode 100644 (file)
index 0000000..5863fae
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http3:jetty-http3-server
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd b/repackage/org.argeo.tp.math/org.locationtech.jts.bnd
deleted file mode 100644 (file)
index b163e3a..0000000
--- a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0
\ No newline at end of file

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

diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd
new file mode 100644 (file)
index 0000000..d65c5cc
--- /dev/null
+++ b/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd
@@ -0,0 +1,15 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.sshd
+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.sshd/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.cli.bnd
new file mode 100644 (file)
index 0000000..ec35e33
--- /dev/null
+++ b/repackage/org.argeo.tp.sshd/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.sshd/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.git.bnd
new file mode 100644 (file)
index 0000000..d4eec3c
--- /dev/null
+++ b/repackage/org.argeo.tp.sshd/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.sshd/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.putty.bnd
new file mode 100644 (file)
index 0000000..67671b2
--- /dev/null
+++ b/repackage/org.argeo.tp.sshd/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.sshd/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.scp.bnd
new file mode 100644 (file)
index 0000000..b1c94d8
--- /dev/null
+++ b/repackage/org.argeo.tp.sshd/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.sshd/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.sftp.bnd
new file mode 100644 (file)
index 0000000..43fc2e4
--- /dev/null
+++ b/repackage/org.argeo.tp.sshd/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/apache-sshd/common.bnd b/repackage/org.argeo.tp/apache-sshd/common.bnd
deleted file mode 100644 (file)
index 70556e9..0000000
--- a/repackage/org.argeo.tp/apache-sshd/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.11.0
\ 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
deleted file mode 100644 (file)
index d65c5cc..0000000
--- a/repackage/org.argeo.tp/apache-sshd/merge.bnd
+++ /dev/null
@@ -1,15 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Bundle-SymbolicName: org.apache.sshd
-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
deleted file mode 100644 (file)
index ec35e33..0000000
--- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644 (file)
index d4eec3c..0000000
--- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644 (file)
index 67671b2..0000000
--- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644 (file)
index b1c94d8..0000000
--- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644 (file)
index 43fc2e4..0000000
--- a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Argeo-Origin-M2: org.apache.sshd:sshd-sftp
-
-Import-Package: \
-org.bouncycastle.*;resolution:=optional,\
-*

diff --git a/repackage/org.argeo.tp/org.locationtech.jts.bnd b/repackage/org.argeo.tp/org.locationtech.jts.bnd
new file mode 100644 (file)
index 0000000..b163e3a
--- /dev/null
+++ b/repackage/org.argeo.tp/org.locationtech.jts.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0
\ No newline at end of file