Merge tag 'v2.3.17' into testing

[gpl/argeo-tp.git] / repackage / org.argeo.tp.httpd / jetty-websocket / merge.bnd

diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index cd469827d7fc170385f1b24cf7df459e5af9e3cb..d82233849d58f992847657d901cebb065263710a 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
+++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
@@ -1,22 +1,33 @@
 Bundle-SymbolicName: org.eclipse.jetty.websocket
 SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
-Argeo-Origin-M2: :10.0.16
+Argeo-Origin-M2: :12.0.4
+# TODO split ee8 and ee10 ?
 Argeo-Origin-M2-Merge: \
-org.eclipse.jetty.websocket:websocket-core-client, \
-org.eclipse.jetty.websocket:websocket-core-common, \
-org.eclipse.jetty.websocket:websocket-core-server, \
-org.eclipse.jetty.websocket:websocket-jetty-api, \
-org.eclipse.jetty.websocket:websocket-jetty-client, \
-org.eclipse.jetty.websocket:websocket-jetty-common, \
-org.eclipse.jetty.websocket:websocket-jetty-server,\
-org.eclipse.jetty.websocket:websocket-javax-client, \
-org.eclipse.jetty.websocket:websocket-javax-common, \
-org.eclipse.jetty.websocket:websocket-javax-server,\
-org.eclipse.jetty.websocket:websocket-servlet, \
+org.eclipse.jetty.websocket:jetty-websocket-core-client, \
+org.eclipse.jetty.websocket:jetty-websocket-core-common, \
+org.eclipse.jetty.websocket:jetty-websocket-core-server, \
+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-jetty-common, \
+org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-api, \
+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-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.*
 
 Import-Package: \
 !java.*, \
-org.eclipse.jetty.webapp;resolution:="optional", \
+org.eclipse.jetty.ee8.webapp;resolution:="optional", \
+org.eclipse.jetty.ee10.webapp;resolution:="optional", \
 *
\ No newline at end of file