8000 Update LICENSE · coder-xing/flume@a1b55d2 · GitHub
[go: up one dir, main page]

Skip to content

Commit a1b55d2

Browse files
Attila Simonbessbd
authored andcommitted
Update LICENSE
The LICENSE file was outdated and missing some license texts This closes apache#68 Reviewers: Mike Percy, Bessenyei Balázs Donát (Attila Simon via Bessenyei Balázs Donát)
1 parent 174bed4 commit a1b55d2

File tree

1 file changed

+47
-6
lines changed

1 file changed

+47
-6
lines changed

LICENSE

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,14 @@ For
233233
irclib-<version>.jar:
234234
jackson-annotations-<version>.jar:
235235
jackson-core-<version>.jar:
236-
jackson-core-asl-1.<version>.jar:
236+
jackson-core-asl-<version>.jar:
237237
jackson-databind-<version>.jar:
238-
jackson-mapper-asl-1.<version>.jar:
238+
jackson-mapper-asl-<version>.jar:
239239
jetty-<version>.jar:
240240
jetty-util-<version>.jar:
241241
joda-time-<version>.jar:
242242
kafka_2.10-<version>.jar:
243+
kafka-clients-<version>.jar:
243244
kite-data-core-<version>.jar:
244245
kite-data-hbase-<version>.jar:
245246
kite-data-hive-<version>.jar:
@@ -264,15 +265,14 @@ For
264265
servlet-api-<version>.jar:
265266
snappy-java-<version>.jar:
266267
twitter4j-core-<version>.jar:
267-
twitter4j-media-support-<version>.jar
268-
twitter4j-stream-<version>.jar
268+
twitter4j-media-support-<version>.jar:
269+
twitter4j-stream-<version>.jar:
269270
velocity-<version>.jar:
270271
xalan-<version>.jar:
271272
xercesImpl-<version>.jar:
272273
xml-apis-<version>.jar:
273274
zkclient-<version>.jar:
274-
zookeeper-<version>.jar:
275-
275+
276276
The Apache License, Version 2.0
277277

278278
For
@@ -527,3 +527,44 @@ For
527527
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
528528
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
529529
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
530+
531+
For
532+
xz-<version>.jar:
533+
534+
Licensing of XZ for Java
535+
========================
536+
537+
All the files in this package have been written by Lasse Collin
538+
and/or Igor Pavlov. All these files have been put into the
539+
public domain. You can do whatever you want with these files.
540+
541+
This software is provided "as is", without any warranty.
542+
543+
544+
For
545+
lz4-<version>.jar
546+
547+
LZ4 Library
548+
Copyright (c) 2011-2014, Yann Collet
549+
All rights reserved.
550+
551+
Redistribution and use in source and binary forms, with or without modification,
552+
are permitted provided that the following conditions are met:
553+
554+
* Redistributions of source code must retain the above copyright notice, this
555+
list of conditions and the following disclaimer.
556+
557+
* Redistributions in binary form must reproduce the above copyright notice, this
558+
list of conditions and the following disclaimer in the documentation and/or
559+
other materials provided with the distribution.
560+
561+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
562+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
563+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
564+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
565+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
566+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
567+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
568+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
569+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
570+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)
0