Return-Path: X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5FFEB109CC for ; Tue, 2 Dec 2014 13:25:44 +0000 (UTC) Received: (qmail 4520 invoked by uid 500); 2 Dec 2014 13:25:44 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 4438 invoked by uid 500); 2 Dec 2014 13:25:44 -0000 Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.apache.org Delivered-To: mailing list commits@marmotta.apache.org Received: (qmail 4394 invoked by uid 99); 2 Dec 2014 13:25:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 13:25:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC3D29B8A90; Tue, 2 Dec 2014 13:25:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jakob@apache.org To: commits@marmotta.apache.org Date: Tue, 02 Dec 2014 13:25:44 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] 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/develop Commit: f6c28c7b46e7456a112de56724222d4c2edac64f Parents: 486afb7 Author: Jakob Frank Authored: Tue Dec 2 13:19:35 2014 +0100 Committer: Jakob Frank 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)