This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 281d6f956a GH-1943: Link to Dexx LICENSE. Put Dexx NOTICE in NOTICE
files
new ee584142ff Merge pull request #1944 from afs/dist-license
281d6f956a is described below
commit 281d6f956a3b7cc2b925dbec306780d069327aee
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Jul 1 11:38:21 2023 +0100
GH-1943: Link to Dexx LICENSE. Put Dexx NOTICE in NOTICE files
---
apache-jena/dist/LICENSE | 20 +-------------------
apache-jena/dist/NOTICE | 2 +-
jena-fuseki2/apache-jena-fuseki/dist/LICENSE | 8 ++++++++
jena-fuseki2/apache-jena-fuseki/dist/NOTICE | 15 +++++++++++++++
4 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/apache-jena/dist/LICENSE b/apache-jena/dist/LICENSE
index 79d16ea138..cc86f3746f 100644
--- a/apache-jena/dist/LICENSE
+++ b/apache-jena/dist/LICENSE
@@ -239,29 +239,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Dexx Collections
https://github.com/andrewoma/dexx
-BSD-Style License
+MIT-Style License
https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
Copyright (c) 2014 Andrew O'Malley
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Jakarta JSON Processing (JSON-P)
diff --git a/apache-jena/dist/NOTICE b/apache-jena/dist/NOTICE
index 85ae72086c..f22f94e40a 100644
--- a/apache-jena/dist/NOTICE
+++ b/apache-jena/dist/NOTICE
@@ -39,7 +39,7 @@ Copyright (c) 2004-2008 QOS.
Dexx Collections
Copyright (c) 2014 Andrew O'Malley
https://github.com/andrewoma/dexx
-BSD-Style License
+MIT-Style License
https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
and includes the following NOTICE
diff --git a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
index 8f98d79140..801db82e23 100644
--- a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
+++ b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
@@ -206,6 +206,14 @@
## Bundled Dependencies ##
+Dexx Collections
+Copyright (c) 2014 Andrew O'Malley
+https://github.com/andrewoma/dexx
+MIT-Style License
+ https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+
+- - - - - - - - - - - - - - - - - - - - - - -
+
Jakarta JSON Processing (JSON-P)
https://eclipse-ee4j.github.io/jsonp/
is licensed under the Eclipse Public License 2.0.
diff --git a/jena-fuseki2/apache-jena-fuseki/dist/NOTICE
b/jena-fuseki2/apache-jena-fuseki/dist/NOTICE
index 077334c79f..dfc151a564 100644
--- a/jena-fuseki2/apache-jena-fuseki/dist/NOTICE
+++ b/jena-fuseki2/apache-jena-fuseki/dist/NOTICE
@@ -16,6 +16,21 @@ These have been licensed to the Apache Software Foundation
under a software gran
This product includes software developed by
PluggedIn Software under a BSD license.
+- - - - - - - - - - - - - - - - - - - - - - -
+
+Dexx Collections
+Copyright (c) 2014 Andrew O'Malley
+https://github.com/andrewoma/dexx
+MIT-Style License
+ https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+
+and includes the following NOTICE
+----------
+Portions based on code from the Scala standard library.
+Copyright (c) 2002-2014 EPFL
+Copyright (c) 2011-2014 Typesafe, Inc.
+Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
+
- - - - - - - - - - - - - - - - - - - - - - -
Apache Xerces Java
