From 88a25967e72d8137147b50c6cb0a221487050369 Mon Sep 17 00:00:00 2001 From: Amogh Jahagirdar Date: Thu, 19 Dec 2024 07:53:41 -0700 Subject: [PATCH] Core, Spark, Flink, Hive: Remove unused failsafe dependency from core and add Failsafe to runtime LICENSE(s) (#11816) --- build.gradle | 1 - flink/v1.18/flink-runtime/LICENSE | 8 ++++++++ flink/v1.19/flink-runtime/LICENSE | 8 ++++++++ flink/v1.20/flink-runtime/LICENSE | 8 ++++++++ hive-runtime/LICENSE | 8 ++++++++ kafka-connect/kafka-connect-runtime/LICENSE | 6 ++++++ spark/v3.3/spark-runtime/LICENSE | 8 ++++++++ spark/v3.4/spark-runtime/LICENSE | 8 ++++++++ spark/v3.5/spark-runtime/LICENSE | 8 ++++++++ 9 files changed, 62 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index eb63ce138ab2..46fd1e3bb3f9 100644 --- a/build.gradle +++ b/build.gradle @@ -347,7 +347,6 @@ project(':iceberg-core') { implementation libs.jackson.core implementation libs.jackson.databind implementation libs.caffeine - implementation libs.failsafe implementation libs.roaringbitmap compileOnly(libs.hadoop2.client) { exclude group: 'org.apache.avro', module: 'avro' diff --git a/flink/v1.18/flink-runtime/LICENSE b/flink/v1.18/flink-runtime/LICENSE index 8ab53469eb87..bbdabc61e3b6 100644 --- a/flink/v1.18/flink-runtime/LICENSE +++ b/flink/v1.18/flink-runtime/LICENSE @@ -500,3 +500,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: http://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file diff --git a/flink/v1.19/flink-runtime/LICENSE b/flink/v1.19/flink-runtime/LICENSE index 8ab53469eb87..e908550aa6a3 100644 --- a/flink/v1.19/flink-runtime/LICENSE +++ b/flink/v1.19/flink-runtime/LICENSE @@ -500,3 +500,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: https://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file diff --git a/flink/v1.20/flink-runtime/LICENSE b/flink/v1.20/flink-runtime/LICENSE index 8ab53469eb87..247c814da784 100644 --- a/flink/v1.20/flink-runtime/LICENSE +++ b/flink/v1.20/flink-runtime/LICENSE @@ -500,3 +500,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: https://www.apache.org/licenses/LICENSE-2.0.html diff --git a/hive-runtime/LICENSE b/hive-runtime/LICENSE index 24cd3612e5e4..c40ec91cbd06 100644 --- a/hive-runtime/LICENSE +++ b/hive-runtime/LICENSE @@ -500,3 +500,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: https://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file diff --git a/kafka-connect/kafka-connect-runtime/LICENSE b/kafka-connect/kafka-connect-runtime/LICENSE index 6eb4fdee65b8..af0a897ff77b 100644 --- a/kafka-connect/kafka-connect-runtime/LICENSE +++ b/kafka-connect/kafka-connect-runtime/LICENSE @@ -722,6 +722,12 @@ License (from POM): The Apache Software License, Version 2.0 - http://www.apache -------------------------------------------------------------------------------- +Group: dev.failsafe Name: failsafe Version: 3.3.2 +Project URL (from POM): https://github.com/failsafe-lib/failsafe +License (from POM): Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt + +-------------------------------------------------------------------------------- + Group: dnsjava Name: dnsjava Version: 2.1.7 Project URL (from POM): http://www.dnsjava.org License (from POM): BSD 2-Clause license - http://opensource.org/licenses/BSD-2-Clause diff --git a/spark/v3.3/spark-runtime/LICENSE b/spark/v3.3/spark-runtime/LICENSE index 1d3e877720d7..4ab20a3a49c9 100644 --- a/spark/v3.3/spark-runtime/LICENSE +++ b/spark/v3.3/spark-runtime/LICENSE @@ -637,3 +637,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: https://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file diff --git a/spark/v3.4/spark-runtime/LICENSE b/spark/v3.4/spark-runtime/LICENSE index 1d3e877720d7..4ab20a3a49c9 100644 --- a/spark/v3.4/spark-runtime/LICENSE +++ b/spark/v3.4/spark-runtime/LICENSE @@ -637,3 +637,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: https://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file diff --git a/spark/v3.5/spark-runtime/LICENSE b/spark/v3.5/spark-runtime/LICENSE index 1d3e877720d7..4ab20a3a49c9 100644 --- a/spark/v3.5/spark-runtime/LICENSE +++ b/spark/v3.5/spark-runtime/LICENSE @@ -637,3 +637,11 @@ This product includes code from Apache HttpComponents Client. Copyright: 1999-2022 The Apache Software Foundation. Home page: https://hc.apache.org/ License: https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + +This binary artifact contains failsafe. + +Copyright: Jonathan Halterman and friends +Home page: https://failsafe.dev/ +License: https://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file