ignite-1067
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/954ae154 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/954ae154 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/954ae154 Branch: refs/heads/ignite-630 Commit: 954ae1543116ab538a5a04ee64172fa780debe80 Parents: dd246e5 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Thu Jul 16 15:26:01 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Thu Jul 16 15:26:01 2015 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 17 +++-------------- assembly/LICENSE_HADOOP | 11 ----------- .../src/main/resources/META-INF/licenses.txt.vm | 4 +--- modules/core/licenses/jsr166-license.txt | 3 +++ modules/core/licenses/snaptree-bsd-license.txt | 2 +- modules/jta/licenses/jta-license.txt | 2 ++ 6 files changed, 10 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954ae154/assembly/LICENSE_FABRIC ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index 794d721..152cc1e 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -227,17 +227,6 @@ 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 header: - -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 - -============================================================================== For JSR107 API and SPI (https://github.com/jsr107/jsr107spec) javax.cache:cache-api:jar:1.0.0 ============================================================================== This product bundles JSR107 API and SPI which is available under a: @@ -256,7 +245,7 @@ This product bundles JLine which is available under a: The BSD License. For details, see http://www.opensource.org/licenses/bsd-license.php. ============================================================================== -For Scala Library (http://www.scala-lang.org/) org.scala-lang:scala-library:jar:2.11.2 +For Scala Library (http://www.scala-lang.org/) org.scala-lang:scala-library:jar:2.* ============================================================================== This product bundles Scala Library which is available under a: BSD 3-Clause. For details, see http://www.scala-lang.org/license.html. @@ -294,8 +283,8 @@ Eclipse Public License - v 1.0. For details, see http://www.eclipse.org/legal/ep ============================================================================== For Java Transaction API (http://java.sun.com/products/jta) javax.transaction:jta:jar:1.1 ============================================================================== -This product bundles Java Transaction API which is available under a: -No licenses. +This product bundles Java Transaction API which is available under it's own license. +See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-classes-oth-JSpec-license.html for details. ============================================================================== For ASM All (http://asm.objectweb.org/asm-all/) org.ow2.asm:asm-all:jar:4.2 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954ae154/assembly/LICENSE_HADOOP ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_HADOOP b/assembly/LICENSE_HADOOP index f6ed34c..cfbaea3 100644 --- a/assembly/LICENSE_HADOOP +++ b/assembly/LICENSE_HADOOP @@ -227,17 +227,6 @@ 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 header: - -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 - -============================================================================== For JSR107 API and SPI (https://github.com/jsr107/jsr107spec) javax.cache:cache-api:jar:1.0.0 ============================================================================== This product bundles JSR107 API and SPI which is available under a: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954ae154/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm ---------------------------------------------------------------------- diff --git a/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm b/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm index f02d9bc..ca1988b 100644 --- a/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm +++ b/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm @@ -25,7 +25,7 @@ #foreach ( $organizationName in $projectsSortedByOrganization.keySet() ) #foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) ) -#if($project.licenses.size() == 1 && $project.licenses.get(0).url.contains("www.apache.org/licenses/LICENSE-2.0") && !$project.licenses.get(0).url.contains("and"))#else +#if((!($project.licenses.size() == 1 && $project.licenses.get(0).url.contains("www.apache.org/licenses/LICENSE-2.0") && !$project.licenses.get(0).url.contains("and"))) && $project.licenses.size() > 0) ============================================================================== For $project.name #if ($project.url)($project.url)#end $project.artifact ============================================================================== @@ -34,8 +34,6 @@ This product bundles $project.name which is available under a: $license.name.replaceAll("[ ]{2,}"," ").replaceAll("\n",""). #if ($license.url)For details, see $license.url.replaceAll("[ ]{2,}"," ").replaceAll("\n","").#end #end -#if ($project.licenses.size() == 0)No licenses. -#end #end #end http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954ae154/modules/core/licenses/jsr166-license.txt ---------------------------------------------------------------------- diff --git a/modules/core/licenses/jsr166-license.txt b/modules/core/licenses/jsr166-license.txt new file mode 100644 index 0000000..24cf176 --- /dev/null +++ b/modules/core/licenses/jsr166-license.txt @@ -0,0 +1,3 @@ +This product sources 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/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954ae154/modules/core/licenses/snaptree-bsd-license.txt ---------------------------------------------------------------------- diff --git a/modules/core/licenses/snaptree-bsd-license.txt b/modules/core/licenses/snaptree-bsd-license.txt index 5e7d327..a4bd0d9 100644 --- a/modules/core/licenses/snaptree-bsd-license.txt +++ b/modules/core/licenses/snaptree-bsd-license.txt @@ -1,4 +1,4 @@ -SNAPTREE LICENSE +This product sources bundles SnapTree classes, which is available under a SNAPTREE LICENSE: Copyright (c) 2009 Stanford University, unless otherwise specified. All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/954ae154/modules/jta/licenses/jta-license.txt ---------------------------------------------------------------------- diff --git a/modules/jta/licenses/jta-license.txt b/modules/jta/licenses/jta-license.txt new file mode 100644 index 0000000..77d0633 --- /dev/null +++ b/modules/jta/licenses/jta-license.txt @@ -0,0 +1,2 @@ +This product bundles Java Transaction API, which is available under it's own license. +See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-classes-oth-JSpec-license.html for details. \ No newline at end of file
