From dd604ba5d8a04f1718050909811a103b0384f5b9 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Sun, 11 Feb 2024 02:23:20 +0100 Subject: [PATCH 1/3] Add Thrift and Hive to NOTICE --- NOTICE | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index d7a3c57526..3efa367633 100644 --- a/NOTICE +++ b/NOTICE @@ -1,8 +1,28 @@ Apache Iceberg -Copyright 2017-2022 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -------------------------------------------------------------------------------- + +This product includes code from Apache Hive, which includes the following in +its NOTICE file: + + Apache Hive + Copyright 2008-2023 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + +-------------------------------------------------------------------------------- + +This product includes code from Apache Thrift, which includes the following in +its NOTICE file: + + Apache Thrift + Copyright (C) 2006 - 2019, The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). From 1c06cbd9b47deff0bd37c66254e6c6a271901907 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Sun, 11 Feb 2024 02:26:49 +0100 Subject: [PATCH 2/3] Add Avro --- NOTICE | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NOTICE b/NOTICE index 3efa367633..1d3c5ffad1 100644 --- a/NOTICE +++ b/NOTICE @@ -26,3 +26,14 @@ its NOTICE file: This product includes software developed at The Apache Software Foundation (http://www.apache.org/). + +-------------------------------------------------------------------------------- + +This product includes code from Apache Thrift, which includes the following in +its NOTICE file: + + Apache Avro + Copyright 2010-2019 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (https://www.apache.org/). From 57c5689ba424a5fe3460abc074e58d5f44ec7c1d Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Mon, 12 Feb 2024 06:25:07 +0100 Subject: [PATCH 3/3] Move from license to notice --- LICENSE | 33 --------------------------------- NOTICE | 34 ++++++++++++++++------------------ 2 files changed, 16 insertions(+), 51 deletions(-) diff --git a/LICENSE b/LICENSE index ffdd12aad2..d645695673 100644 --- a/LICENSE +++ b/LICENSE @@ -200,36 +200,3 @@ 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 code from Apache Avro. - -* Code for initializing the Avro (de)compression codecs -* The Binary decoder for reading in an Avro byte stream - -Copyright: 2014-2022 The Apache Software Foundation. -Home page: https://avro.apache.org/ -License: https://www.apache.org/licenses/LICENSE-2.0 - --------------------------------------------------------------------------------- - -This product includes code from Apache Thrift. - -* Uses the fb303.thrift file that's part of Hive's thrift service in vendor/fb303/ - -Copyright: 2006-2022 The Apache Software Foundation. -Home page: https://thrift.apache.org/ -License: https://www.apache.org/licenses/LICENSE-2.0 - --------------------------------------------------------------------------------- - -This product includes code from Apache Hive. - -* Uses hive_metastore.thrift to generate the Hive Metastore client in vendor/hive_metastore/ - -Copyright: 2008-2022 The Apache Software Foundation. -Home page: https://hive.apache.org/ -License: https://www.apache.org/licenses/LICENSE-2.0 - --------------------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 1d3c5ffad1..9acae0de12 100644 --- a/NOTICE +++ b/NOTICE @@ -7,33 +7,31 @@ The Apache Software Foundation (http://www.apache.org/). -------------------------------------------------------------------------------- -This product includes code from Apache Hive, which includes the following in -its NOTICE file: +This product includes code from Apache Avro. - Apache Hive - Copyright 2008-2023 The Apache Software Foundation +* Code for initializing the Avro (de)compression codecs +* The Binary decoder for reading in an Avro byte stream - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +Copyright: 2014-2022 The Apache Software Foundation. +Home page: https://avro.apache.org/ +License: https://www.apache.org/licenses/LICENSE-2.0 -------------------------------------------------------------------------------- -This product includes code from Apache Thrift, which includes the following in -its NOTICE file: +This product includes code from Apache Thrift. - Apache Thrift - Copyright (C) 2006 - 2019, The Apache Software Foundation +* Uses the fb303.thrift file that's part of Hive's thrift service in vendor/fb303/ - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). +Copyright: 2006-2022 The Apache Software Foundation. +Home page: https://thrift.apache.org/ +License: https://www.apache.org/licenses/LICENSE-2.0 -------------------------------------------------------------------------------- -This product includes code from Apache Thrift, which includes the following in -its NOTICE file: +This product includes code from Apache Hive. - Apache Avro - Copyright 2010-2019 The Apache Software Foundation +* Uses hive_metastore.thrift to generate the Hive Metastore client in vendor/hive_metastore/ - This product includes software developed at - The Apache Software Foundation (https://www.apache.org/). +Copyright: 2008-2022 The Apache Software Foundation. +Home page: https://hive.apache.org/ +License: https://www.apache.org/licenses/LICENSE-2.0