From 5787fb3479ec7089c4b5d3a71cce004883304abe Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 8 Dec 2023 08:35:44 +0100 Subject: [PATCH] Move JTS to base TP. Add Jetty EE10, HTTP3. Move SSHD to own category. --- repackage/Makefile | 4 ++-- repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd | 9 ++++++++- .../jetty/org.eclipse.jetty.ee10.servlet.bnd | 2 ++ .../jetty/org.eclipse.jetty.ee8.server.bnd.disabled | 2 -- .../jetty/org.eclipse.jetty.http2.client.transport.bnd | 2 ++ .../jetty/org.eclipse.jetty.http3.client.bnd | 2 ++ .../jetty/org.eclipse.jetty.http3.client.transport.bnd | 2 ++ .../jetty/org.eclipse.jetty.http3.common.bnd | 2 ++ .../jetty/org.eclipse.jetty.http3.qpack.bnd | 2 ++ .../jetty/org.eclipse.jetty.http3.server.bnd | 2 ++ .../apache-sshd/common.bnd | 0 .../apache-sshd/merge.bnd | 0 .../apache-sshd/org.apache.sshd.cli.bnd | 0 .../apache-sshd/org.apache.sshd.git.bnd | 0 .../apache-sshd/org.apache.sshd.putty.bnd | 0 .../apache-sshd/org.apache.sshd.scp.bnd | 0 .../apache-sshd/org.apache.sshd.sftp.bnd | 0 .../org.locationtech.jts.bnd | 0 18 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee10.servlet.bnd delete mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.ee8.server.bnd.disabled create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.transport.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.client.transport.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.common.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.qpack.bnd create mode 100644 repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http3.server.bnd rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/common.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/merge.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/org.apache.sshd.cli.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/org.apache.sshd.git.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/org.apache.sshd.putty.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/org.apache.sshd.scp.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sshd}/apache-sshd/org.apache.sshd.sftp.bnd (100%) rename repackage/{org.argeo.tp.math => org.argeo.tp}/org.locationtech.jts.bnd (100%) diff --git a/repackage/Makefile b/repackage/Makefile index d48c6a4..37eb377 100644 --- 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 9b0ac9c..d85d0da 100644 --- 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 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 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 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 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 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 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 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 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/apache-sshd/common.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/common.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/common.bnd diff --git a/repackage/org.argeo.tp/apache-sshd/merge.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/merge.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/merge.bnd diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.cli.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/org.apache.sshd.cli.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.cli.bnd diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.git.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/org.apache.sshd.git.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.git.bnd diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.putty.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/org.apache.sshd.putty.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.putty.bnd diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.scp.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/org.apache.sshd.scp.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.scp.bnd diff --git a/repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.sftp.bnd similarity index 100% rename from repackage/org.argeo.tp/apache-sshd/org.apache.sshd.sftp.bnd rename to repackage/org.argeo.tp.sshd/apache-sshd/org.apache.sshd.sftp.bnd diff --git a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd b/repackage/org.argeo.tp/org.locationtech.jts.bnd similarity index 100% rename from repackage/org.argeo.tp.math/org.locationtech.jts.bnd rename to repackage/org.argeo.tp/org.locationtech.jts.bnd -- 2.30.2