minor 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/3dcda269 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3dcda269 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3dcda269 Branch: refs/heads/ignite-901 Commit: 3dcda269644f05d07468a9d8a4d3534ec9804f13 Parents: 62835dd Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Tue Jul 7 20:57:58 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Tue Jul 7 20:57:58 2015 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 79 ++++++++++++++++++++ assembly/LICENSE_HADOOP | 32 ++++++++ assembly/dependencies-fabric.xml | 1 + .../src/main/resources/META-INF/licenses.txt.vm | 3 +- modules/spark/licenses/scala-bsd-license.txt | 18 ----- 5 files changed, 114 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcda269/assembly/LICENSE_FABRIC ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index 7649b39..794d721 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -236,3 +236,82 @@ 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: +JSR-000107 JCACHE 2.9 Public Review - Updated Specification License. For details, see https://raw.github.com/jsr107/jsr107spec/master/LICENSE.txt. + +============================================================================== +For JSch (http://www.jcraft.com/jsch/) com.jcraft:jsch:jar:0.1.50 +============================================================================== +This product bundles JSch which is available under a: +Revised BSD. For details, see http://www.jcraft.com/jsch/LICENSE.txt. + +============================================================================== +For JLine (http://nexus.sonatype.org/oss-repository-hosting.html/jline) jline:jline:jar:2.12.1 +============================================================================== +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 +============================================================================== +This product bundles Scala Library which is available under a: +BSD 3-Clause. For details, see http://www.scala-lang.org/license.html. + +============================================================================== +For H2 Database Engine (http://www.h2database.com) com.h2database:h2:jar:1.3.175 +============================================================================== +This product bundles H2 Database Engine which is available under a: +The H2 License, Version 1.0. For details, see http://h2database.com/html/license.html. + +============================================================================== +For JTidy (http://jtidy.sourceforge.net) net.sf.jtidy:jtidy:jar:r938 +============================================================================== +This product bundles JTidy which is available under a: +Java HTML Tidy License. For details, see http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95. + +============================================================================== +For tomcat-servlet-api (http://tomcat.apache.org/) org.apache.tomcat:tomcat-servlet-api:jar:8.0.23 +============================================================================== +This product bundles tomcat-servlet-api which is available under a: +Apache License, Version 2.0 and Common Development And Distribution License (CDDL) Version 1.0. For details, see http://www.apache.org/licenses/LICENSE-2.0.txt and http://www.opensource.org/licenses/cddl1.txt. + +============================================================================== +For AOP alliance (http://aopalliance.sourceforge.net) aopalliance:aopalliance:jar:1.0 +============================================================================== +This product bundles AOP alliance which is available under a: +Public Domain. + +============================================================================== +For AspectJ (http://www.aspectj.org) org.aspectj:*:jar:1.7.2 +============================================================================== +This product bundles AspectJ which is available under a: +Eclipse Public License - v 1.0. For details, see http://www.eclipse.org/legal/epl-v10.html. + +============================================================================== +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. + +============================================================================== +For ASM All (http://asm.objectweb.org/asm-all/) org.ow2.asm:asm-all:jar:4.2 +============================================================================== +This product bundles ASM All which is available under a: +BSD. For details, see http://asm.objectweb.org/license.html. + +============================================================================== +For Jetty (http://www.eclipse.org/jetty) org.eclipse.jetty:*:jar:9.2.11.v20150529 +============================================================================== +This product bundles Jetty which is available under a: +Apache Software License - Version 2.0. For details, see http://www.apache.org/licenses/LICENSE-2.0. +Eclipse Public License - Version 1.0. For details, see http://www.eclipse.org/org/documents/epl-v10.php. + +============================================================================== +For SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4 +============================================================================== +This product bundles SLF4J API Module which is available under a: +MIT License. For details, see http://www.opensource.org/licenses/mit-license.php. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcda269/assembly/LICENSE_HADOOP ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_HADOOP b/assembly/LICENSE_HADOOP index 7649b39..f6ed34c 100644 --- a/assembly/LICENSE_HADOOP +++ b/assembly/LICENSE_HADOOP @@ -236,3 +236,35 @@ 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: +JSR-000107 JCACHE 2.9 Public Review - Updated Specification License. For details, see https://raw.github.com/jsr107/jsr107spec/master/LICENSE.txt. + +============================================================================== +For JSch (http://www.jcraft.com/jsch/) com.jcraft:jsch:jar:0.1.50 +============================================================================== +This product bundles JSch which is available under a: +Revised BSD. For details, see http://www.jcraft.com/jsch/LICENSE.txt. + +============================================================================== +For JLine (http://nexus.sonatype.org/oss-repository-hosting.html/jline) jline:jline:jar:2.12.1 +============================================================================== +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 +============================================================================== +This product bundles Scala Library which is available under a: +BSD 3-Clause. For details, see http://www.scala-lang.org/license.html. + +============================================================================== +For ASM All (http://asm.objectweb.org/asm-all/) org.ow2.asm:asm-all:jar:4.2 +============================================================================== +This product bundles ASM All which is available under a: +BSD. For details, see http://asm.objectweb.org/license.html. + + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcda269/assembly/dependencies-fabric.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml index 93f96f1..f69ffde 100644 --- a/assembly/dependencies-fabric.xml +++ b/assembly/dependencies-fabric.xml @@ -128,6 +128,7 @@ <exclude>org.apache.ignite:ignite-hadoop</exclude> <exclude>org.apache.ignite:ignite-schema-import</exclude> <exclude>org.apache.ignite:ignite-codegen</exclude> + <exclude>org.apache.ignite:ignite-apache-license-gen</exclude> </excludes> <sources> <includeModuleDirectory>true</includeModuleDirectory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcda269/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 cb756c1..f02d9bc 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 @@ -34,7 +34,8 @@ 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 +#if ($project.licenses.size() == 0)No licenses. +#end #end #end http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcda269/modules/spark/licenses/scala-bsd-license.txt ---------------------------------------------------------------------- diff --git a/modules/spark/licenses/scala-bsd-license.txt b/modules/spark/licenses/scala-bsd-license.txt deleted file mode 100644 index b2be111..0000000 --- a/modules/spark/licenses/scala-bsd-license.txt +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) 2002-2014 EPFL -Copyright (c) 2011-2014 Typesafe, Inc. - -All rights reserved. - -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 the EPFL 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. \ No newline at end of file
