You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/04/09 08:34:21 UTC
[16/50] [abbrv] git commit: more work arounf LICENSE and NOTICE files
for the binary distributions
more work arounf LICENSE and NOTICE files for the binary distributions
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d5055d6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d5055d6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d5055d6b
Branch: refs/heads/develop
Commit: d5055d6bc893bcc5f2da0c00fe881b20482c8beb
Parents: e4f9877
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Apr 8 11:30:53 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Apr 8 11:30:53 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/installer/LICENSE.txt | 35 +
.../src/main/resources/installer/NOTICE.txt | 8 +
launchers/marmotta-webapp/LICENSE.txt | 2862 +++++++++++++++
launchers/marmotta-webapp/NOTICE.txt | 317 ++-
license-mappings.xml | 43 +-
5 files changed, 3185 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d5055d6b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
index ba7be79..4a0bf89 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
@@ -2262,6 +2262,41 @@ For the Expression Language component,
of liability.
+For the "Java Concurrency in Practice" book annotations component,
+
+ Copyright (c) 2005 Brian Goetz and Tim Peierls, http://jcip.net
+
+ Creative Commons Attribution License 2.5, http://creativecommons.org/licenses/by/2.5/legalcode
+
+
+For the Hamcrest component,
+
+ Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman, http://www.hamcrest.org
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions and the following disclaimer. Redistributions in binary form must reproduce
+ the above copyright notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ Neither the name of Hamcrest nor the names of its contributors may be used to endorse
+ or promote products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+
Apache Marmotta code subcomponents:
===================================
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d5055d6b/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 78ee118..3da7e34 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -228,6 +228,14 @@ This product also includes the following third-party components:
Apache Software Foundation that were originally developed at
iClick, Inc., software copyright (c) 1999.
+* "Java Concurrency in Practice" book annotations component, http://jcip.net
+
+ Copyright (c) 2005 Brian Goetz and Tim Peierls
+
+* Hamcrest, http://www.hamcrest.org
+
+ Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman
+
* D3.js, http://d3js.org
Copyright (c) 2013 Michael Bostock