IGNITE-3793: Need to fix dependencies and it's licenses Reviewed and merged by Denis Magda (dma...@apache.org)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d20b7f1d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d20b7f1d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d20b7f1d Branch: refs/heads/ignite-4436-2 Commit: d20b7f1d29fae7c7907fa9905ac39493ec66b465 Parents: 96527d9 Author: Alexander Fedotov <alexander.fedot...@gmail.com> Authored: Fri Feb 3 10:10:49 2017 -0800 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Feb 3 10:10:49 2017 -0800 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 35 ++++++++++---------- assembly/LICENSE_HADOOP | 17 +++++----- examples/schema-import/bin/h2-server.bat | 2 +- examples/schema-import/bin/h2-server.sh | 4 +-- .../schema-import/bin/schema-import.properties | 2 +- .../src/main/resources/META-INF/licenses.txt.vm | 7 ++-- 6 files changed, 32 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d20b7f1d/assembly/LICENSE_FABRIC ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index b9c75b2..35a8529 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -214,9 +214,8 @@ licenses. ============================================================================== For SnapTree: ============================================================================== -This product bundles SnapTree, which is available under a -"3-clause BSD" license. For details, see -https://github.com/nbronson/snaptree/blob/master/LICENSE. +This product bundles SnapTree, which is available under the following: +"3-clause BSD" license. For details, see https://github.com/nbronson/snaptree/blob/master/LICENSE. ============================================================================== For JSR 166 classes in "org.jsr166" package @@ -228,55 +227,55 @@ http://creativecommons.org/publicdomain/zero/1.0/ ============================================================================== 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. +This product bundles JSR107 API and SPI which is available under the following: +JSR-000107 JCACHE 2.9 Public Review - Updated Specification License. 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: +This product bundles JSch which is available under the following: 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: +This product bundles JLine which is available under the following: 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.* ============================================================================== -This product bundles Scala Library which is available under a: +This product bundles Scala Library which is available under the following: 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 +For H2 Database Engine (http://www.h2database.com) com.h2database:h2:jar:1.4.191 ============================================================================== -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. +This product bundles H2 Database Engine which is available under the following: +MPL 2.0, and EPL 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: +This product bundles JTidy which is available under the following: 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: +This product bundles tomcat-servlet-api which is available under the following: 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: +This product bundles AOP alliance which is available under the following: Public Domain. ============================================================================== For AspectJ (http://www.aspectj.org) org.aspectj:*:jar:1.7.2 ============================================================================== -This product bundles AspectJ which is available under a: +This product bundles AspectJ which is available under the following: Eclipse Public License - v 1.0. For details, see http://www.eclipse.org/legal/epl-v10.html. ============================================================================== @@ -288,18 +287,18 @@ See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-cla ============================================================================== 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: +This product bundles ASM All which is available under the following: 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: +This product bundles Jetty which is available under the following: 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: +This product bundles SLF4J API Module which is available under the following: MIT License. For details, see http://www.opensource.org/licenses/mit-license.php. http://git-wip-us.apache.org/repos/asf/ignite/blob/d20b7f1d/assembly/LICENSE_HADOOP ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_HADOOP b/assembly/LICENSE_HADOOP index 0256b20..f2128fe 100644 --- a/assembly/LICENSE_HADOOP +++ b/assembly/LICENSE_HADOOP @@ -214,9 +214,8 @@ licenses. ============================================================================== For SnapTree: ============================================================================== -This product bundles SnapTree, which is available under a -"3-clause BSD" license. For details, see -https://github.com/nbronson/snaptree/blob/master/LICENSE. +This product bundles SnapTree, which is available under the following: +"3-clause BSD" license. For details, see https://github.com/nbronson/snaptree/blob/master/LICENSE. ============================================================================== For JSR 166 classes in "org.jsr166" package @@ -228,31 +227,31 @@ http://creativecommons.org/publicdomain/zero/1.0/ ============================================================================== 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. +This product bundles JSR107 API and SPI which is available under the following: +JSR-000107 JCACHE 2.9 Public Review - Updated Specification License. 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: +This product bundles JSch which is available under the following: 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: +This product bundles JLine which is available under the following: 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: +This product bundles Scala Library which is available under the following: 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: +This product bundles ASM All which is available under the following: BSD. For details, see http://asm.objectweb.org/license.html. http://git-wip-us.apache.org/repos/asf/ignite/blob/d20b7f1d/examples/schema-import/bin/h2-server.bat ---------------------------------------------------------------------- diff --git a/examples/schema-import/bin/h2-server.bat b/examples/schema-import/bin/h2-server.bat index 3f220d1..d445231 100644 --- a/examples/schema-import/bin/h2-server.bat +++ b/examples/schema-import/bin/h2-server.bat @@ -75,6 +75,6 @@ if exist "%IGNITE_HOME%\config" goto run :run :: Starts H2 server and console. -"%JAVA_HOME%\bin\java.exe" -cp "%IGNITE_HOME%\libs\ignite-indexing\h2-1.3.175.jar" org.h2.tools.Console %* +"%JAVA_HOME%\bin\java.exe" -cp "%IGNITE_HOME%\libs\ignite-indexing\h2-1.4.191.jar" org.h2.tools.Console %* :error_finish \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/d20b7f1d/examples/schema-import/bin/h2-server.sh ---------------------------------------------------------------------- diff --git a/examples/schema-import/bin/h2-server.sh b/examples/schema-import/bin/h2-server.sh index e714f4c..512a1d9 100755 --- a/examples/schema-import/bin/h2-server.sh +++ b/examples/schema-import/bin/h2-server.sh @@ -58,9 +58,9 @@ fi # Starts H2 server and console. case $osname in Darwin*) - "${JAVA}" "${DOCK_OPTS}" -cp "${IGNITE_HOME}/libs/ignite-indexing/h2-1.3.175.jar" org.h2.tools.Console ${ARGS} + "${JAVA}" "${DOCK_OPTS}" -cp "${IGNITE_HOME}/libs/ignite-indexing/h2-1.4.191.jar" org.h2.tools.Console ${ARGS} ;; *) - "${JAVA}" -cp "${IGNITE_HOME}/libs/ignite-indexing/h2-1.3.175.jar" org.h2.tools.Console ${ARGS} + "${JAVA}" -cp "${IGNITE_HOME}/libs/ignite-indexing/h2-1.4.191.jar" org.h2.tools.Console ${ARGS} ;; esac http://git-wip-us.apache.org/repos/asf/ignite/blob/d20b7f1d/examples/schema-import/bin/schema-import.properties ---------------------------------------------------------------------- diff --git a/examples/schema-import/bin/schema-import.properties b/examples/schema-import/bin/schema-import.properties index 5d31965..99ebab8 100644 --- a/examples/schema-import/bin/schema-import.properties +++ b/examples/schema-import/bin/schema-import.properties @@ -19,7 +19,7 @@ # Predefined properties for Ignite Schema Import Demo # jdbc.db.preset=0 -jdbc.driver.jar=libs/ignite-indexing/h2-1.3.175.jar +jdbc.driver.jar=libs/ignite-indexing/h2-1.4.191.jar jdbc.driver.class=org.h2.Driver jdbc.url=jdbc:h2:tcp://localhost/~/schema-import/demo jdbc.user=sa http://git-wip-us.apache.org/repos/asf/ignite/blob/d20b7f1d/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 ca1988b..ede7960 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 @@ -19,17 +19,16 @@ ## $Id$ ## // ------------------------------------------------------------------ -// List of #if ($projectName)$projectName#else${project.name}#end module's dependencies provided as a part of this distribution -// which licenses differ from Apache Software License. +// List of #if ($projectName)$projectName#else${project.name}#end module's dependencies provided as a part of this distribution. // ------------------------------------------------------------------ #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"))) && $project.licenses.size() > 0) +#if($project.licenses.size() > 0) ============================================================================== For $project.name #if ($project.url)($project.url)#end $project.artifact ============================================================================== -This product bundles $project.name which is available under a: +This product bundles $project.name which is available under the following: #foreach ( $license in $project.licenses ) $license.name.replaceAll("[ ]{2,}"," ").replaceAll("\n",""). #if ($license.url)For details, see $license.url.replaceAll("[ ]{2,}"," ").replaceAll("\n","").#end