ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsetrak...@apache.org
Subject incubator-ignite git commit: # ignite-45 - licenses fix.
Date Mon, 23 Mar 2015 04:30:00 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-45 46fb0889b -> 224bbb0ef


# ignite-45 - licenses fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/224bbb0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/224bbb0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/224bbb0e

Branch: refs/heads/ignite-45
Commit: 224bbb0efe1bb3c3a74b4f0fe2347ace2d8dd518
Parents: 46fb088
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Sun Mar 22 21:29:56 2015 -0700
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Sun Mar 22 21:29:56 2015 -0700

----------------------------------------------------------------------
 LICENSE.txt | 55 +++++++++++++++++++++----------------------------------
 NOTICE.txt  | 17 ++++-------------
 2 files changed, 25 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224bbb0e/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 623a7be..62b28db 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -215,37 +215,24 @@ licenses.
 ==============================================================================
 For SnapTree:
 ==============================================================================
-BSD LICENSE
-
-Copyright (c) 2009 Stanford University, unless otherwise specified.
-All rights reserved.
-
-This software was developed by the Pervasive Parallelism Laboratory of
-Stanford University, California, USA.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. 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.
-
-   3. Neither the name of Stanford University 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 REGENTS 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 REGENTS 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.
+This product bundles SnapTree, which is available under a
+"3-clause BSD" license.  For details, see
+https://github.com/nbronson/snaptree/blob/master/LICENSE.
+
+==============================================================================
+For JSR 166 classes in "org.jsr166" package
+==============================================================================
+This product bundles JSR-166 classes which are donated to public domain.
+For details, see CC0 1.0 Universal (1.0), Public Domain Dedication,
+http://creativecommons.org/publicdomain/zero/1.0/
+
+==============================================================================
+For books used for tests in "org.apache.ignite.internal.processors.hadoop.books"
+==============================================================================
+This code bundles book text files used for testing purposes which contain
+the following disclaimer:
+
+This eBook is for the use of anyone anywhere at no cost and with
+almost no restrictions whatsoever.  You may copy it, give it away or
+re-use it under the terms of the Project Gutenberg License included
+with this eBook or online at www.gutenberg.org

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224bbb0e/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 256cf7d..298d05b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -5,17 +5,8 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 
-This software has a dependency on JetBrains Annotations licensed under
-Apache License, Version 2.0.
+This software includes code from IntelliJ IDEA Community Edition
+Copyright (C) JetBrains s.r.o.
+https://www.jetbrains.com/idea/
+Licensed under Apache License, Version 2.0.
 http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar
-
-
-This software has a dependency on snaptree library,
-licensed under BSD 3-clause license.
-https://github.com/nbronson/snaptree/
-
-
-This software, specifically package "org.jdk8.backport", has a dependency on
-concurrency libraries written by Doug Lea with assistance from members of JCP JSR-166
-Expert Group and released to the public domain, as explained at
-http://creativecommons.org/publicdomain/zero/1.0/.


Mime
View raw message