X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=repackage%2Forg.argeo.tp.jetty%2Fjetty-websocket%2Fmerge.bnd;h=7bed46c688815edc855822c614a213ce13bf66ab;hb=5b76fdf3107f6023bbb74bd2f37c09dd3793bd83;hp=abaada790782f3f1fdfa615f2d90c396ebd1a51d;hpb=1d84ad373b3cf1b9fd34e53e15bd266a8181cbaf;p=gpl%2Fargeo-tp.git diff --git a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd index abaada7..7bed46c 100644 --- a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd @@ -1,7 +1,7 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket -Bundle-License: Apache-2.0 -SLC-Origin-M2: :10.0.12 -SLC-Origin-M2-Merge: \ +SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 +Argeo-Origin-M2: :10.0.14 +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, \