PARQUET-111: Update LICENSE and NOTICE.

rdblue · rdblue · commit 45e29f2a0a97 · 2015-02-02T15:52:37.000-08:00
* Add Daniel Lemire's copyright and license to LICENSE (third party)
* Add ARRIS's and Lukas Nalezenc's NOTICE sections to root NOTICE
* Remove NOTICE entries for Apache dependencies, not included in src
diff --git a/LICENSE b/LICENSE
@@ -174,4 +174,16 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
+
+--------------------------------------------------------------------------------
+
+This project includes code from Daniel Lemire's JavaFastPFOR project. The
+"Lemire" bit packing source code produced by parquet-generator is derived from
+the JavaFastPFOR project.
+
+Copyright: 2013 Daniel Lemire
+Home page: http://lemire.me/en/
+Project page: https://github.com/lemire/JavaFastPFOR
+License: Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0
+
diff --git a/NOTICE b/NOTICE
@@ -5,17 +5,41 @@ Copyright 2014 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Third Party Dependencies:
+--------------------------------------------------------------------------------
 
-Pig 11.0
-Apache Public License 2.0
-http://pig.apache.org
+This product includes parquet-tools, initially developed at ARRIS, Inc. with
+the following copyright notice:
 
-Hadoop 0.20.2+
-Apache Public License 2.0
-http://hadoop.apache.org
+  Copyright 2013 ARRIS, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+--------------------------------------------------------------------------------
+
+This product includes parquet-protobuf, initially developed by Lukas Nalezenc
+with the following copyright notice:
+
+  Copyright 2013 Lukas Nalezenec.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
-This project includes code from https://github.com/lemire/JavaFastPFOR
-parquet-column/src/main/java/parquet/column/values/bitpacking/LemireBitPacking.java
-Apache License Version 2.0 http://www.apache.org/licenses/.
-(c) Daniel Lemire, http://lemire.me/en/
