Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-03-26 03:24:38 +0000
committerGreg Wilkins2015-03-26 03:24:38 +0000
commit55f92e8229316906dac8b1b84b49bb4dfb3d5017 (patch)
tree70aab419556c2572f7573819ecca5ec5e56f59f3
parentfd12bb8c5c2237c22fb212810fc82ded140493bb (diff)
downloadorg.eclipse.jetty.project-55f92e8229316906dac8b1b84b49bb4dfb3d5017.tar.gz
org.eclipse.jetty.project-55f92e8229316906dac8b1b84b49bb4dfb3d5017.tar.xz
org.eclipse.jetty.project-55f92e8229316906dac8b1b84b49bb4dfb3d5017.zip
updated NOTICE.txt for possible ALPN inclusion
-rw-r--r--NOTICE.txt33
1 files changed, 20 insertions, 13 deletions
diff --git a/NOTICE.txt b/NOTICE.txt
index 8c06275b67..2374687755 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -22,33 +22,40 @@ Jetty may be distributed under either license.
Eclipse
The following artifacts are EPL.
-
-org.eclipse.jetty.orbit:org.eclipse.jdt.core
-
+ * org.eclipse.jetty.orbit:org.eclipse.jdt.core
The following artifacts are EPL and ASL2.
-
-org.eclipse.jetty.orbit:javax.security.auth.message
+ * org.eclipse.jetty.orbit:javax.security.auth.message
The following artifacts are EPL and CDDL 1.0.
-
-org.eclipse.jetty.orbit:javax.mail.glassfish
-
+ * org.eclipse.jetty.orbit:javax.mail.glassfish
------
Oracle
The following artifacts are CDDL + GPLv2 with classpath exception.
-
https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
-javax.servlet:javax.servlet-api
-javax.annotation:javax.annotation-api
-javax.transaction:javax.transaction-api
-javax.websocket:javax.websocket-api
+ * javax.servlet:javax.servlet-api
+ * javax.annotation:javax.annotation-api
+ * javax.transaction:javax.transaction-api
+ * javax.websocket:javax.websocket-api
+
+------
+Oracle OpenJDK
+
+If ALPN is used to negotiate HTTP/2 connections, then the following
+artifacts may be included in the distribution or downloaded when ALPN
+module is selected.
+
+ * java.sun.security.ssl
+These artifacts replace/modify OpenJDK classes. The modififications
+are hosted at github and both modified and original are under GPL v2 with
+classpath exceptions.
+http://openjdk.java.net/legal/gplv2+ce.html
------

Back to the top