You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2018/06/18 18:36:14 UTC
[55/62] [abbrv] marmotta git commit: Add 3rd-party code from ostrich
(abseil+gtest) to the NOTICE.txt
Add 3rd-party code from ostrich (abseil+gtest) to the NOTICE.txt
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/04fbf29a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/04fbf29a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/04fbf29a
Branch: refs/heads/master
Commit: 04fbf29ab9dc4dd5c34a0b2df5b0f99974bd5317
Parents: a0f5452
Author: Jakob Frank <ja...@apache.org>
Authored: Tue May 1 20:47:14 2018 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue May 1 20:47:14 2018 +0200
----------------------------------------------------------------------
NOTICE.txt | 14 +++++++++++---
libraries/ostrich/README.md | 11 +++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/04fbf29a/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 50e9d5d..c69fda1 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -17,9 +17,17 @@ This product also includes some third-party source components:
is licensed under BSD license. The original source code is available from
http://javolution.org
- * The module kiwi/kiwi-triplestore contains a modified and customized version
- of the ScriptRunner.java script. ScriptRunner has copyright (c) 2004 Clinton
+ * The module kiwi/kiwi-triplestore contains a modified and customized version
+ of the ScriptRunner.java script. ScriptRunner has copyright (c) 2004 Clinton
Begin, with minor later contributions by several authors, and is licensed
- under Apache License 2.0. The original source dode is available from
+ under Apache License 2.0. The original source code is available from
https://gist.github.com/joe776/831762
+ * The module libraries/ostrich/backend contains unmodified versions of
+ Abseil - C++ Common Libraries and Google Test:
+ - Abseil - C++ Common Libraries (libraries/ostrich/backend/3rdparty/abseil)
+ is licensed under Apache License 2.0, the original source code is available
+ from https://github.com/abseil/abseil-cpp
+ - Google Test (libraries/ostrich/backend/3rdparty/gtest) is licensed under
+ BSD-3-Clause, the original source code is available from
+ https://github.com/google/googletest
http://git-wip-us.apache.org/repos/asf/marmotta/blob/04fbf29a/libraries/ostrich/README.md
----------------------------------------------------------------------
diff --git a/libraries/ostrich/README.md b/libraries/ostrich/README.md
index 62db012..2ee6120 100644
--- a/libraries/ostrich/README.md
+++ b/libraries/ostrich/README.md
@@ -103,3 +103,14 @@ a large turtle file, run:
The client connects by default to `localhost:10000` (change with `--host` and `--port` flags).
+## 3rd-Party Source Code
+
+The native backend implementation contains 3rd-party source code (located in `backend/3rdparty`).
+
+* **Abseil - C++ Common Libraries** (`backend/3rdparty/abseil`)
+ is licensed under *Apache License 2.0*, the original source code is available
+ from https://github.com/abseil/abseil-cpp
+* **Google Test** (`backend/3rdparty/gtest`) is licensed under
+ *BSD-3-Clause*, the original source code is available from
+ https://github.com/google/googletest
+