Repository: flume Updated Branches: refs/heads/trunk 05feab49b -> 14ab61ef1
Update LICENSE The LICENSE file was outdated and missing some license texts This closes #68 Reviewers: Mike Percy, Bessenyei Balázs Donát (Attila Simon via Bessenyei Balázs Donát) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/14ab61ef Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/14ab61ef Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/14ab61ef Branch: refs/heads/trunk Commit: 14ab61ef199278a4f1f683baffc2084b471f6c64 Parents: 05feab4 Author: Attila Simon <s...@cloudera.com> Authored: Wed Oct 12 19:21:28 2016 +0200 Committer: Bessenyei Balázs Donát <bes...@apache.org> Committed: Wed Oct 12 19:21:28 2016 +0200 ---------------------------------------------------------------------- LICENSE | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/14ab61ef/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index adcfc34..92cb484 100644 --- a/LICENSE +++ b/LICENSE @@ -233,13 +233,14 @@ For irclib-<version>.jar: jackson-annotations-<version>.jar: jackson-core-<version>.jar: - jackson-core-asl-1.<version>.jar: + jackson-core-asl-<version>.jar: jackson-databind-<version>.jar: - jackson-mapper-asl-1.<version>.jar: + jackson-mapper-asl-<version>.jar: jetty-<version>.jar: jetty-util-<version>.jar: joda-time-<version>.jar: kafka_2.10-<version>.jar: + kafka-clients-<version>.jar: kite-data-core-<version>.jar: kite-data-hbase-<version>.jar: kite-data-hive-<version>.jar: @@ -264,15 +265,14 @@ For servlet-api-<version>.jar: snappy-java-<version>.jar: twitter4j-core-<version>.jar: - twitter4j-media-support-<version>.jar - twitter4j-stream-<version>.jar + twitter4j-media-support-<version>.jar: + twitter4j-stream-<version>.jar: velocity-<version>.jar: xalan-<version>.jar: xercesImpl-<version>.jar: xml-apis-<version>.jar: zkclient-<version>.jar: - zookeeper-<version>.jar: - + The Apache License, Version 2.0 For @@ -527,3 +527,44 @@ For 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. + +For + xz-<version>.jar: + + Licensing of XZ for Java + ======================== + + All the files in this package have been written by Lasse Collin + and/or Igor Pavlov. All these files have been put into the + public domain. You can do whatever you want with these files. + + This software is provided "as is", without any warranty. + + +For + lz4-<version>.jar + + LZ4 Library + Copyright (c) 2011-2014, Yann Collet + 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. + + 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. \ No newline at end of file
