flume git commit: FLUME-2683. Update License file for 1.6 release

[hs...@apache.org]

Repository: flume
Updated Branches:
  refs/heads/trunk 8443062c8 -> 2f2c4984d


FLUME-2683. Update License file for 1.6 release

(Johny Rufus via Hari)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/2f2c4984
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/2f2c4984
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/2f2c4984

Branch: refs/heads/trunk
Commit: 2f2c4984d1d6da5f34304fd201ddcf3c8e5173bd
Parents: 8443062
Author: Hari Shreedharan <hs...@apache.org>
Authored: Mon Apr 20 14:39:40 2015 -0700
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Mon Apr 20 14:40:15 2015 -0700

----------------------------------------------------------------------
 LICENSE | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/2f2c4984/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ab42e22..adcfc34 100644
--- a/LICENSE
+++ b/LICENSE
@@ -215,27 +215,39 @@ For
  commons-cli-<version>.jar:
  commons-codec-<version>.jar:
  commons-collections-<version>.jar:
+ commons-compress-<version>.jar:
  commons-dbcp-<version>.jar:
  commons-io-<version>.jar:
  commons-jexl-<version>.jar:
  commons-lang-<version>.jar:
  commons-logging-<version>.jar:
  commons-pool-<version>.jar:
+ curator-client-<version>.jar:
+ curator-framework-<version>.jar:
+ curator-recipes-<version>.jar:
  derby-<version>.jar:
  guava-<version>.jar:
  gson-<version>.jar:
  httpclient-<version>.jar:
  httpcore-<version>.jar:
  irclib-<version>.jar:
+ jackson-annotations-<version>.jar:
+ jackson-core-<version>.jar:
  jackson-core-asl-1.<version>.jar:
+ jackson-databind-<version>.jar:
  jackson-mapper-asl-1.<version>.jar:
  jetty-<version>.jar:
  jetty-util-<version>.jar:
  joda-time-<version>.jar:
- kite-data-core-<version>.jar 
+ kafka_2.10-<version>.jar:
+ kite-data-core-<version>.jar:
+ kite-data-hbase-<version>.jar:
+ kite-data-hive-<version>.jar:
+ kite-hadoop-compatibility-<version>.jar:
  libthrift-<version>.jar:
  log4j-<version>.jar:
  mapdb-<version>.jar:
+ metrics-core-<version>.jar:
  mina-core-<version>.jar:
  netty-<version>.jar:
  opencsv-<version>.jar:
@@ -246,12 +258,19 @@ For
  parquet-format-<version>.jar:
  parquet-generator-<version>.jar:
  parquet-hadoop-<version>.jar:
+ parquet-hive-bundle-<version>.jar:
+ parquet-jackson-<version>.jar:
+ serializer-<version>.jar:
  servlet-api-<version>.jar:
  snappy-java-<version>.jar:
  twitter4j-core-<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
@@ -448,3 +467,63 @@ For
   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
   OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For
+  jopt-simple-<version>.jar:
+
+   The MIT License
+
+   Copyright (c) 2004-2011 Paul R. Holser, Jr.
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For
+  scala-library-<version>.jar:
+
+   BSD License
+
+   Copyright (c) 2002-2015 EPFL
+   Copyright (c) 2011-2015 Typesafe, Inc.
+
+   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.
+
+    - Neither the name of the EPFL 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 OWNER 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.