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/62835ddd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62835ddd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62835ddd Branch: refs/heads/ignite-gg-9615 Commit: 62835dddc4122e2cd8d3c42b7cbe19d3a701abf0 Parents: a1e7d11 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Tue Jul 7 20:22:13 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Tue Jul 7 20:22:13 2015 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 74 -------------------- assembly/LICENSE_HADOOP | 32 --------- .../src/main/resources/META-INF/licenses.txt.vm | 10 ++- 3 files changed, 7 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62835ddd/assembly/LICENSE_FABRIC ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index 3fbc5fb..7649b39 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -236,77 +236,3 @@ 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 - -============================================================================== -JCraft -============================================================================== -This product bundles JCraft, which is available under a BSD license. -For details, see http://www.jcraft.com/jsch/LICENSE.txt. - -============================================================================== -JLine -============================================================================== -This product bundles JLine, which is available under a "2-clause BSD" license. -For details, see http://opensource.org/licenses/bsd-license.php. - -============================================================================== -Scala -============================================================================== -This product bundles Scala, which is available under a BSD license. -For details, see http://www.scala-lang.org/license.html. - -============================================================================== -JCache-API (JSR-107) -============================================================================== -This product bundles JCache-API, which is available under a JSR-000107 JCACHE 2.9 Public Review - Updated Specification -License. -For details, see https://raw.githubusercontent.com/jsr107/jsr107spec/master/LICENSE.txt. - -============================================================================== -H2 -============================================================================== -This product bundles H2, which is available under the MPL 2.0 (Mozilla Public License Version 2.0) -or under the EPL 1.0 (Eclipse Public License). -For details, see https://www.mozilla.org/MPL/2.0/ and http://opensource.org/licenses/eclipse-1.0.php - -============================================================================== -AOP Alliance -============================================================================== -All the source code provided by AOP Alliance is Public Domain. - -============================================================================== -AspectJ -============================================================================== -This product bundles AspectJ, which is available under a Eclipse Public License 1.0. -For details, see https://eclipse.org/legal/epl-v10.html. - -============================================================================== -Java Transaction API -============================================================================== -This product bundles Java Transaction API, which is available under a CDDL license. -For details, see http://opensource.org/licenses/cddl1.php. - -============================================================================== -Jetty -============================================================================== -This product bundles Jetty, which is available under a Apache License 2.0 and Eclipse Public License 1.0. -For details, see https://www.eclipse.org/legal/epl-v10.html. - -============================================================================== -SLF4J -============================================================================== -This product bundles SLF4J, which is available under MIT license. -For details, see http://www.slf4j.org/license.html. - -============================================================================== -JTidy -============================================================================== -This product bundles JTidy, which is available under MIT license. -For details, see http://jtidy.sourceforge.net/license.html. - -============================================================================== -Tomcat Servlet API -============================================================================== -This product bundles Tomcat Servlet API, which is available under Apache License, Version 2.0 and -Common Development And Distribution License (CDDL) Version 1.0. -For details, see http://www.opensource.org/licenses/cddl1.txt. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62835ddd/assembly/LICENSE_HADOOP ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_HADOOP b/assembly/LICENSE_HADOOP index 09189f8..7649b39 100644 --- a/assembly/LICENSE_HADOOP +++ b/assembly/LICENSE_HADOOP @@ -236,35 +236,3 @@ 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 - -============================================================================== -JCraft -============================================================================== -This product bundles JCraft, which is available under a BSD license. -For details, see http://www.jcraft.com/jsch/LICENSE.txt. - -============================================================================== -JLine -============================================================================== -This product bundles JLine, which is available under a "2-clause BSD" license. -For details, see http://opensource.org/licenses/bsd-license.php. - -============================================================================== -Scala -============================================================================== -This product bundles Scala, which is available under a BSD license. -For details, see http://www.scala-lang.org/license.html. - -============================================================================== -JCache-API (JSR-107) -============================================================================== -This product bundles JCache-API, which is available under a JSR-000107 JCACHE 2.9 Public Review - Updated Specification -License. -For details, see https://raw.githubusercontent.com/jsr107/jsr107spec/master/LICENSE.txt. - -============================================================================== -ASM -============================================================================== -This product bundles ASM, which is available under a BSD license. -For details, see http://asm.ow2.org/license.html. - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62835ddd/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 32c6c09..cb756c1 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 @@ -20,14 +20,18 @@ ## // ------------------------------------------------------------------ // List of #if ($projectName)$projectName#else${project.name}#end module's dependencies provided as a part of this distribution -// with licenses differ from Apache Software License. +// which licenses differ from Apache Software License. // ------------------------------------------------------------------ + #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 - - $project.name #if ($project.url)($project.url)#end $project.artifact +============================================================================== +For $project.name #if ($project.url)($project.url)#end $project.artifact +============================================================================== +This product bundles $project.name which is available under a: #foreach ( $license in $project.licenses ) - License: $license.name #if ($license.url) ($license.url)#end +$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
