projects
/
gpl
/
argeo-tp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Mention that Jetty can be licensed under EPL 2.0
[gpl/argeo-tp.git]
/
repackage
/
org.argeo.tp.jetty
/
jetty-websocket
/
merge.bnd
diff --git
a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
index 43ade042df77d0bc55dd7b1eceaabb58596c6a7c..7bed46c688815edc855822c614a213ce13bf66ab 100644
(file)
--- a/
repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
+++ b/
repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
@@
-1,5
+1,5
@@
Bundle-SymbolicName: org.eclipse.jetty.websocket
-SPDX-License-Identifier: Apache-2.0
+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, \