Repository: incubator-systemml Updated Branches: refs/heads/master b20533b5e -> 9dc42b2fc
Assembly, NOTICE, and LICENSE updates for release Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/9dc42b2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/9dc42b2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/9dc42b2f Branch: refs/heads/master Commit: 9dc42b2fc8277bbd0a78ed1056a8c4259b859483 Parents: b20533b Author: Deron Eriksson <[email protected]> Authored: Wed May 18 15:10:38 2016 -0700 Committer: Deron Eriksson <[email protected]> Committed: Wed May 18 15:10:38 2016 -0700 ---------------------------------------------------------------------- src/assembly/distrib/LICENSE | 10 +++--- src/assembly/inmemory.xml | 2 ++ src/assembly/inmemory/LICENSE | 10 +++--- src/assembly/jar/LICENSE | 10 +++--- src/assembly/standalone-jar.xml | 2 ++ src/assembly/standalone-jar/LICENSE | 2 +- src/assembly/standalone/LICENSE | 52 +++++++++++++++++++++++++++----- src/assembly/standalone/NOTICE | 4 +++ 8 files changed, 68 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/distrib/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/distrib/LICENSE b/src/assembly/distrib/LICENSE index cb1e931..0779d38 100644 --- a/src/assembly/distrib/LICENSE +++ b/src/assembly/distrib/LICENSE @@ -204,15 +204,15 @@ The following compile-scope dependencies come under the Apache Software License 2.0. -Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:14.0.1 -Apache Wink :: JSON4J (http://www.apache.org/wink/wink-json4j/) org.apache.wink:wink-json4j:jar:1.4 +Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:14.0.1 +Apache Wink :: JSON4J (http://www.apache.org/wink/wink-json4j/) org.apache.wink:wink-json4j:1.4 =============================================================================== The following compile-scope ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Runtime Annotations (http://www.antlr.org/antlr4-annotations) org.antlr:antlr4-annotations:jar:4.3 -ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:jar:4.3 +ANTLR 4 Runtime Annotations (http://www.antlr.org/antlr4-annotations) org.antlr:antlr4-annotations:4.3 +ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. @@ -253,7 +253,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The following compile-scope abego TreeLayout Core dependency is distributed under the BSD license. -abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1 +abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:1.0.1 Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/inmemory.xml ---------------------------------------------------------------------- diff --git a/src/assembly/inmemory.xml b/src/assembly/inmemory.xml index 3aea74c..c911e33 100644 --- a/src/assembly/inmemory.xml +++ b/src/assembly/inmemory.xml @@ -90,6 +90,8 @@ <exclude>META-INF/LICENSE.txt</exclude> <exclude>META-INF/NOTICE.txt</exclude> <exclude>META-INF/README.txt</exclude> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/NOTICE</exclude> </excludes> </unpackOptions> <outputDirectory>.</outputDirectory> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/inmemory/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/inmemory/LICENSE b/src/assembly/inmemory/LICENSE index 2e21120..1e5f51c 100644 --- a/src/assembly/inmemory/LICENSE +++ b/src/assembly/inmemory/LICENSE @@ -215,15 +215,15 @@ org.apache.hadoop:hadoop-common:2.4.1 org.apache.hadoop:hadoop-mapreduce-client-core:2.4.1 Compile-scope dependencies: -com.google.guava:guava:bundle:14.0.1 -org.apache.wink:wink-json4j:jar:1.4 +com.google.guava:guava:14.0.1 +org.apache.wink:wink-json4j:1.4 =============================================================================== The following ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Runtime Annotations (http://www.antlr.org) org.antlr:antlr4-annotations:jar:4.3 -ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:jar:4.3 +ANTLR 4 Runtime Annotations (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 +ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. @@ -263,7 +263,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The abego TreeLayout Core dependency is distributed under the BSD license. -abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1 +abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:1.0.1 Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/jar/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/jar/LICENSE b/src/assembly/jar/LICENSE index cb1e931..0779d38 100644 --- a/src/assembly/jar/LICENSE +++ b/src/assembly/jar/LICENSE @@ -204,15 +204,15 @@ The following compile-scope dependencies come under the Apache Software License 2.0. -Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:14.0.1 -Apache Wink :: JSON4J (http://www.apache.org/wink/wink-json4j/) org.apache.wink:wink-json4j:jar:1.4 +Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:14.0.1 +Apache Wink :: JSON4J (http://www.apache.org/wink/wink-json4j/) org.apache.wink:wink-json4j:1.4 =============================================================================== The following compile-scope ANTLR dependencies are distributed under the BSD license. -ANTLR 4 Runtime Annotations (http://www.antlr.org/antlr4-annotations) org.antlr:antlr4-annotations:jar:4.3 -ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:jar:4.3 +ANTLR 4 Runtime Annotations (http://www.antlr.org/antlr4-annotations) org.antlr:antlr4-annotations:4.3 +ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:4.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. @@ -253,7 +253,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The following compile-scope abego TreeLayout Core dependency is distributed under the BSD license. -abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1 +abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:1.0.1 Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/standalone-jar.xml ---------------------------------------------------------------------- diff --git a/src/assembly/standalone-jar.xml b/src/assembly/standalone-jar.xml index c6c6412..cf7150e 100644 --- a/src/assembly/standalone-jar.xml +++ b/src/assembly/standalone-jar.xml @@ -111,6 +111,8 @@ <exclude>META-INF/LICENSE.txt</exclude> <exclude>META-INF/NOTICE.txt</exclude> <exclude>META-INF/README.txt</exclude> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/NOTICE</exclude> </excludes> </unpackOptions> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/standalone-jar/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/standalone-jar/LICENSE b/src/assembly/standalone-jar/LICENSE index ad6ced2..44fd886 100644 --- a/src/assembly/standalone-jar/LICENSE +++ b/src/assembly/standalone-jar/LICENSE @@ -210,6 +210,7 @@ commons-configuration:commons-configuration:1.6 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.1.1 log4j:log4j:1.2.15 +net.sf.opencsv:opencsv:1.8 org.apache.avro:avro:1.7.4 org.apache.commons:commons-math3:3.1.1 org.apache.hadoop:hadoop-auth:2.4.1 @@ -229,7 +230,6 @@ org.apache.hadoop:hadoop-yarn-server-nodemanager:2.4.1 org.apache.hadoop:hadoop-yarn-server-web-proxy:2.4.1 org.codehaus.jackson:jackson-core-asl:1.8.8 org.codehaus.jackson:jackson-mapper-asl:1.8.8 -net.sf.opencsv:opencsv:1.8 Compile-scope dependencies: com.google.guava:guava:14.0.1 http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/standalone/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/standalone/LICENSE b/src/assembly/standalone/LICENSE index 68749a3..935f30c 100644 --- a/src/assembly/standalone/LICENSE +++ b/src/assembly/standalone/LICENSE @@ -204,7 +204,6 @@ The following components come under the Apache Software License 2.0. - avro-1.7.4.jar commons-cli-1.2.jar commons-collections-3.2.1.jar @@ -233,7 +232,7 @@ jackson-mapper-asl-1.8.8.jar log4j-1.2.15.jar opencsv-1.8.jar -The following windows only components come under Apache Software License 2.0 +The following windows-only components come under the Apache Software License 2.0. hadoop.dll hadoop.exp @@ -244,11 +243,12 @@ winutils.exe winutils.pdb =============================================================================== -The ANTLR is distributed under the BSD license with the following copyright: -antlr4-4.3.jar -antlr4-annotations-4.3.jar -antlr4-runtime-4.3.jar +The following ANTLR dependencies are distributed under the BSD license. + +ANTLR 4 Tool (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 (antlr4-4.3.jar) +ANTLR 4 Runtime Annotations (http://www.antlr.org) org.antlr:antlr4-annotations:4.3 +ANTLR 4 Runtime (http://www.antlr.org) org.antlr:antlr4-runtime:4.3 Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved. @@ -284,11 +284,47 @@ 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. +================================================================================ + +The abego TreeLayout Core dependency is distributed under the BSD license. + +abego TreeLayout Core (http://code.google.com/p/treelayout/) org.abego.treelayout:org.abego.treelayout.core:1.0.1 + +Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) +All rights reserved. + +BSD license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted 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 the abego Software GmbH 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 HOLDER 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. ================================================================================ -The slf4j-api-1.7.10.jar and slf4j-log4j12-1.7.10.jar are distributed under the -MIT license: +The following SLF4J dependencies are distributed under the MIT license. + +SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:1.7.10 (slf4j-api-1.7.10.jar) +SLF4J LOG4J-12 Binding (http://www.slf4j.org) org.slf4j:slf4j-log4j12:1.7.10 (slf4j-log4j12-1.7.10.jar) Copyright (c) 2004-2008 QOS.ch All rights reserved. http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/9dc42b2f/src/assembly/standalone/NOTICE ---------------------------------------------------------------------- diff --git a/src/assembly/standalone/NOTICE b/src/assembly/standalone/NOTICE index be1c9c6..067f1bc 100644 --- a/src/assembly/standalone/NOTICE +++ b/src/assembly/standalone/NOTICE @@ -4,6 +4,10 @@ Copyright [2015-2016] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This product includes abego software (http://www.abego.org) +Copyright (c) 2011, abego Software GmbH, Germany +All rights reserved. + This product includes ANTLR software (http://www.antlr.org/) Copyright (c) 2012 Terence Parr and Sam Harwell All rights reserved.
