You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/04/18 12:51:34 UTC

[jena] 02/03: JENA-1691: NOTICE additions for new bundled binaries

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git

commit e1a392ef30357d3108fe3aabd6c8609a5d97f997
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Apr 18 13:50:01 2019 +0100

    JENA-1691: NOTICE additions for new bundled binaries
---
 .../src/main/resources/META-INF/NOTICE             |   8 ++
 .../src/main/resources/META-INF/NOTICE             |  10 ++
 .../jena-fuseki-war/war-inclusions/META-INF/NOTICE | 131 ++-------------------
 3 files changed, 28 insertions(+), 121 deletions(-)

diff --git a/jena-fuseki2/jena-fuseki-fulljar/src/main/resources/META-INF/NOTICE b/jena-fuseki2/jena-fuseki-fulljar/src/main/resources/META-INF/NOTICE
index d32bd30..1f5a619 100644
--- a/jena-fuseki2/jena-fuseki-fulljar/src/main/resources/META-INF/NOTICE
+++ b/jena-fuseki2/jena-fuseki-fulljar/src/main/resources/META-INF/NOTICE
@@ -24,6 +24,14 @@ Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
 
 - - - - - - - - - - - - - - - - - - - - - - -
 
+This product bundles "LatencyUtils"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/LatencyUtils/LatencyUtils/blob/master/LICENSE
+
+This product bundles "HdrHistogram"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/HdrHistogram/HdrHistogram/blob/master/LICENSE.txt
+
 This product bundles "Bootstrap", which is available under an
 MIT license.  See: https://github.com/twbs/bootstrap/blob/master/LICENSE
 
diff --git a/jena-fuseki2/jena-fuseki-server/src/main/resources/META-INF/NOTICE b/jena-fuseki2/jena-fuseki-server/src/main/resources/META-INF/NOTICE
index 74e1535..0d8e52d 100644
--- a/jena-fuseki2/jena-fuseki-server/src/main/resources/META-INF/NOTICE
+++ b/jena-fuseki2/jena-fuseki-server/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,16 @@ MIT license (MIT).  See https://www.slf4j.org/license.html
 
 - - - - - - - - - - - - - - - - - - - - - - -
 
+This product bundles "LatencyUtils"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/LatencyUtils/LatencyUtils/blob/master/LICENSE
+
+This product bundles "HdrHistogram"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/HdrHistogram/HdrHistogram/blob/master/LICENSE.txt
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
 This product bundles "jsonld-java" , which is available under a
 BSD licnese (BSD-3-Clause). See 
 https://github.com/jsonld-java/jsonld-java/blob/master/LICENCE
diff --git a/jena-fuseki2/jena-fuseki-war/war-inclusions/META-INF/NOTICE b/jena-fuseki2/jena-fuseki-war/war-inclusions/META-INF/NOTICE
index b38264b..244445e 100644
--- a/jena-fuseki2/jena-fuseki-war/war-inclusions/META-INF/NOTICE
+++ b/jena-fuseki2/jena-fuseki-war/war-inclusions/META-INF/NOTICE
@@ -27,6 +27,16 @@ Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
 
 - - - - - - - - - - - - - - - - - - - - - - -
 
+This product bundles "LatencyUtils"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/LatencyUtils/LatencyUtils/blob/master/LICENSE
+
+This product bundles "HdrHistogram"
+which is available under a "BSD 2-Clause License" (BSD-2-Clause).
+See https://github.com/HdrHistogram/HdrHistogram/blob/master/LICENSE.txt
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
 This product bundles "Bootstrap", which is available under an
 MIT license.  See: https://github.com/twbs/bootstrap/blob/master/LICENSE
 
@@ -95,124 +105,3 @@ This product bundles "YASR - Yet Another Sparql Resultset GUI"
 which is available under an MIT License.
 See http://yasr.yasgui.org/license.txt
 from https://github.com/YASGUI/YASR
-
-- - - - - - - - - - - - - - - - - - - - - - -
-
-==============================================================
- Jetty Web Container
- Copyright 1995-2019 Mort Bay Consulting Pty Ltd.
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted.
-
-Jetty is dual licensed under both
-
-  * The Apache 2.0 License
-    http://www.apache.org/licenses/LICENSE-2.0.html
-
-      and
-
-  * The Eclipse Public 1.0 License
-    http://www.eclipse.org/legal/epl-v10.html
-
-Jetty may be distributed under either license.
-
-------
-Eclipse
-
-The following artifacts are EPL.
- * org.eclipse.jetty.orbit:org.eclipse.jdt.core
-
-The following artifacts are EPL and ASL2.
- * org.eclipse.jetty.orbit:javax.security.auth.message
-
-
-The following artifacts are EPL and CDDL 1.0.
- * 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
-
-------
-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
-
-
-------
-OW2
-
-The following artifacts are licensed by the OW2 Foundation according to the
-terms of http://asm.ow2.org/license.html
-
-org.ow2.asm:asm-commons
-org.ow2.asm:asm
-
-
-------
-Apache
-
-The following artifacts are ASL2 licensed.
-
-org.apache.taglibs:taglibs-standard-spec
-org.apache.taglibs:taglibs-standard-impl
-
-
-------
-MortBay
-
-The following artifacts are ASL2 licensed.  Based on selected classes from 
-following Apache Tomcat jars, all ASL2 licensed.
-
-org.mortbay.jasper:apache-jsp
-  org.apache.tomcat:tomcat-jasper
-  org.apache.tomcat:tomcat-juli
-  org.apache.tomcat:tomcat-jsp-api
-  org.apache.tomcat:tomcat-el-api
-  org.apache.tomcat:tomcat-jasper-el
-  org.apache.tomcat:tomcat-api
-  org.apache.tomcat:tomcat-util-scan
-  org.apache.tomcat:tomcat-util
-
-org.mortbay.jasper:apache-el
-  org.apache.tomcat:tomcat-jasper-el
-  org.apache.tomcat:tomcat-el-api
-
-
-------
-Mortbay
-
-The following artifacts are CDDL + GPLv2 with classpath exception.
-
-https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
-
-org.eclipse.jetty.toolchain:jetty-schemas
-
-------
-Assorted
-
-The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.