From ccadf50d4c3ec9d07e1f4a223cdef97be0d4cdc9 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Mon, 12 Feb 2024 18:33:05 +0100 Subject: [PATCH 1/2] Revert "Add Thrift and Hive to NOTICE (#410)" This reverts commit e9e265a1878a55a4385580bf800382fd75c912c9. --- LICENSE | 33 +++++++++++++++++++++++++++++++++ NOTICE | 31 +------------------------------ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/LICENSE b/LICENSE index d645695673..ffdd12aad2 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,36 @@ 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 9acae0de12..d7a3c57526 100644 --- a/NOTICE +++ b/NOTICE @@ -1,37 +1,8 @@ Apache Iceberg -Copyright 2017-2024 The Apache Software Foundation +Copyright 2017-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -------------------------------------------------------------------------------- - -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 From e2c7299e9c452ac0b476be564479621e3c76e5eb Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 13 Feb 2024 20:39:45 +0100 Subject: [PATCH 2/2] Update year --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index d7a3c57526..adcae2d516 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ 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/).