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 2014/12/05 16:36:50 UTC
[41/50] [abbrv] marmotta git commit: MARMOTTA-510: Bubbling up NOTICE
entries from commons-compress;
affects marmotta-webapp and marmotta-installer binary packages since they ship
the dependencies.
MARMOTTA-510: Bubbling up NOTICE entries from commons-compress;
affects marmotta-webapp and marmotta-installer binary packages since they ship the dependencies.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f6c28c7b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f6c28c7b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f6c28c7b
Branch: refs/heads/master
Commit: f6c28c7b46e7456a112de56724222d4c2edac64f
Parents: 486afb7
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Dec 2 13:19:35 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Dec 2 13:19:35 2014 +0100
----------------------------------------------------------------------
.../marmotta-installer/src/main/resources/installer/NOTICE.txt | 6 ++++++
launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE | 6 ++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f6c28c7b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
index 644d2c0..878bb23 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -46,3 +46,9 @@ This product also includes some third-party binary components:
* Apache HttpComponents, which contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+
+ * Apache Commons Compress, which contains files in the package
+ org.apache.commons.compress.archivers.sevenz were derived from the
+ LZMA SDK, version 9.20 (C/ and CPP/7zip/), which has been placed in
+ the public domain:
+ "LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html)
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f6c28c7b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
index 2c6b204..ced6dea 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -46,3 +46,9 @@ This product also includes some third-party binary components:
* Apache HttpComponents, which contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+
+ * Apache Commons Compress, which contains files in the package
+ org.apache.commons.compress.archivers.sevenz were derived from the
+ LZMA SDK, version 9.20 (C/ and CPP/7zip/), which has been placed in
+ the public domain:
+ "LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html)