X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=repackage%2Forg.argeo.tp.httpd%2Fjetty-websocket%2Fmerge.bnd;h=4bbcbe29a94a75a91ce5a2f6e83e4f88ba1ae2e0;hb=450b3f463b8adf5a485184581efa391d5a8bc49c;hp=7612c79dfddc01fa84fba709f287ca0c1940d9db;hpb=26a275bed197df22a2ea9c5baf5f0833efc3f38f;p=gpl%2Fargeo-tp.git

diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index 7612c79..4bbcbe2 100644
--- 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.15
+Argeo-Origin-M2: :12.0.7
+# 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