From fd944b2509ec116e923aa190bdd1a9c6cdadeed3 Mon Sep 17 00:00:00 2001 From: mingji Date: Tue, 30 Jan 2024 16:45:21 +0800 Subject: [PATCH] [CELEBORN-1250][FOLLOWUP] Fix license issues ### What changes were proposed in this pull request? As title ### Why are the changes needed? Fix license issues for the main branch cherry-pick https://github.com/apache/incubator-celeborn/pull/2259 and https://github.com/apache/incubator-celeborn/pull/2268 into the main branch. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Pass GA Closes #2271 from cfmcgrady/license-main. Authored-by: mingji Signed-off-by: mingji --- LICENSE | 5 +-- LICENSE-binary | 39 +++++++------------ NOTICE-binary | 9 +++-- .../src/main/resources/META-INF/LICENSE | 15 +++---- .../src/main/resources/META-INF/LICENSE | 15 +++---- .../src/main/resources/META-INF/LICENSE | 15 +++---- .../src/main/resources/META-INF/LICENSE | 15 +++---- .../src/main/resources/META-INF/LICENSE | 23 ++++++----- .../META-INF/licenses/LICENSE-zstd-jni.txt | 26 +++++++++++++ .../src/main/resources/META-INF/LICENSE | 15 +++---- .../src/main/resources/META-INF/LICENSE | 15 +++---- ...ENCE-jdktools.txt => LICENSE-jdktools.txt} | 0 .../{LISENCE-slf4j.txt => LICENSE-slf4j.txt} | 0 13 files changed, 109 insertions(+), 83 deletions(-) create mode 100644 client-mr/mr-shaded/src/main/resources/META-INF/licenses/LICENSE-zstd-jni.txt rename licenses-binary/{LISENCE-jdktools.txt => LICENSE-jdktools.txt} (100%) rename licenses-binary/{LISENCE-slf4j.txt => LICENSE-slf4j.txt} (100%) diff --git a/LICENSE b/LICENSE index 1783e11c4..865b656da 100644 --- a/LICENSE +++ b/LICENSE @@ -202,9 +202,8 @@ ------------------------------------------------------------------------------------ -This product bundles various third-party components under other open source licenses. -This section summarizes those components and their licenses. See licenses/ -for text of these licenses. +This product bundles various third-party components under the same license. +This section summarizes those components. Apache License 2.0 diff --git a/LICENSE-binary b/LICENSE-binary index c2fd1d57c..945016f5b 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -203,8 +203,14 @@ ------------------------------------------------------------------------------------ This project bundles the following dependencies under the Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt): +com.fasterxml.jackson.core:jackson-annotations +com.fasterxml.jackson.core:jackson-core +com.fasterxml.jackson.core:jackson-databind +com.fasterxml.jackson.module:jackson-module-scala com.google.code.findbugs:jsr305 +com.google.guava:failureaccess com.google.guava:guava +com.thoughtworks.paranamer:paranamer commons-cli:commons-cli commons-io:commons-io commons-logging:commons-logging @@ -243,20 +249,8 @@ io.netty:netty-transport-sctp io.netty:netty-transport-udt org.apache.commons:commons-crypto org.apache.commons:commons-lang3 -org.apache.hadoop:hadoop-auth -org.apache.hadoop:hadoop-client org.apache.hadoop:hadoop-client-api org.apache.hadoop:hadoop-client-runtime -org.apache.hadoop:hadoop-common -org.apache.hadoop:hadoop-hdfs-client -org.apache.hadoop:hadoop-mapreduce-client-app -org.apache.hadoop:hadoop-mapreduce-client-common -org.apache.hadoop:hadoop-mapreduce-client-core -org.apache.hadoop:hadoop-mapreduce-client-jobclient -org.apache.hadoop:hadoop-mapreduce-client-shuffle -org.apache.hadoop:hadoop-yarn-api -org.apache.hadoop:hadoop-yarn-common -org.apache.htrace:htrace-core4 org.apache.logging.log4j:log4j-1.2-api org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core @@ -275,17 +269,12 @@ org.javassist:javassist org.reflections:reflections org.roaringbitmap:RoaringBitmap org.roaringbitmap:shims +org.rocksdb:rocksdbjni org.scala-lang:scala-library org.scala-lang:scala-reflect org.slf4j:jcl-over-slf4j +org.xerial.snappy:snappy-java org.yaml:snakeyaml -org.rocksdb:rocksdbjni -com.fasterxml.jackson.module:jackson-module-scala -com.fasterxml.jackson.core:jackson-databind -com.fasterxml.jackson.core:jackson-annotations -com.fasterxml.jackson.core:jackson-core -com.thoughtworks.paranamer:paranamer - ------------------------------------------------------------------------------------ This product bundles various third-party components under other open source licenses. @@ -295,25 +284,25 @@ for text of these licenses. BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java -See license/LICENSE-leveldbjni.txt for details. +See licenses/LICENSE-leveldbjni.txt for details. org.fusesource.leveldbjni:leveldbjni-all Common Development and Distribution License (CDDL) 1.0 ------------ -See license/LICENSE-CDDL.txt for details. +See licenses/LICENSE-CDDL.txt for details. javax.servlet:javax.servlet-api MIT License ------------ -See license/LISENCE-jdktools.txt for details. +See licenses/LICENSE-jdktools.txt for details. com.github.olivergondza:maven-jdk-tools-wrapper -See license/LICENSE-slf4j.txt for details. +See licenses/LICENSE-slf4j.txt for details. org.slf4j:jul-to-slf4j org.slf4j:slf4j-api ------------ -See license/LICENSE-javassist.txt for detail. +See licenses/LICENSE-javassist.txt for detail. org.javassist:javassist diff --git a/NOTICE-binary b/NOTICE-binary index 8f9a27eba..8e59fff41 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -47,6 +47,9 @@ This product includes software developed at The Alibaba Group Holding Ltd Apache Commons CLI Copyright 2002-2021 The Apache Software Foundation +Apache Commons Crypto +Copyright 2016-2024 The Apache Software Foundation + Apache Commons IO Copyright 2002-2023 The Apache Software Foundation @@ -56,9 +59,6 @@ Copyright 2001-2021 The Apache Software Foundation Apache Commons Logging Copyright 2003-2013 The Apache Software Foundation -htrace-core4 -Copyright 2016 The Apache Software Foundation - Apache Log4j 1.x Compatibility API Copyright 1999-2022 The Apache Software Foundation @@ -120,3 +120,6 @@ See the License for the specific language governing permissions and limitations under the License. This software includes projects with other licenses -- see `doc/LICENSE.md`. + +This product includes software developed by Google + Snappy: http://code.google.com/p/snappy/ (New BSD License) diff --git a/client-flink/flink-1.14-shaded/src/main/resources/META-INF/LICENSE b/client-flink/flink-1.14-shaded/src/main/resources/META-INF/LICENSE index 0441af2ac..924ef2c85 100644 --- a/client-flink/flink-1.14-shaded/src/main/resources/META-INF/LICENSE +++ b/client-flink/flink-1.14-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,8 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,23 +226,23 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.roaringbitmap:RoaringBitmap BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java diff --git a/client-flink/flink-1.15-shaded/src/main/resources/META-INF/LICENSE b/client-flink/flink-1.15-shaded/src/main/resources/META-INF/LICENSE index 0441af2ac..924ef2c85 100644 --- a/client-flink/flink-1.15-shaded/src/main/resources/META-INF/LICENSE +++ b/client-flink/flink-1.15-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,8 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,23 +226,23 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.roaringbitmap:RoaringBitmap BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java diff --git a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE index 0441af2ac..924ef2c85 100644 --- a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE +++ b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,8 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,23 +226,23 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.roaringbitmap:RoaringBitmap BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java diff --git a/client-flink/flink-1.18-shaded/src/main/resources/META-INF/LICENSE b/client-flink/flink-1.18-shaded/src/main/resources/META-INF/LICENSE index 0441af2ac..924ef2c85 100644 --- a/client-flink/flink-1.18-shaded/src/main/resources/META-INF/LICENSE +++ b/client-flink/flink-1.18-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,8 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,23 +226,23 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.roaringbitmap:RoaringBitmap BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java diff --git a/client-mr/mr-shaded/src/main/resources/META-INF/LICENSE b/client-mr/mr-shaded/src/main/resources/META-INF/LICENSE index 95cedd99a..ec665dcc8 100644 --- a/client-mr/mr-shaded/src/main/resources/META-INF/LICENSE +++ b/client-mr/mr-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,9 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava +io.netty:netty io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,26 +227,27 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava -org.roaringbitmap:RoaringBitmap +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.lz4:lz4-java -io.netty:netty +org.roaringbitmap:RoaringBitmap org.scala-lang:scala-library -BSD 3-clause +BSD ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java +See licenses/LICENSE-zstd-jni.txt for details. +com.github.luben:zstd-jni diff --git a/client-mr/mr-shaded/src/main/resources/META-INF/licenses/LICENSE-zstd-jni.txt b/client-mr/mr-shaded/src/main/resources/META-INF/licenses/LICENSE-zstd-jni.txt new file mode 100644 index 000000000..7bdccb6a9 --- /dev/null +++ b/client-mr/mr-shaded/src/main/resources/META-INF/licenses/LICENSE-zstd-jni.txt @@ -0,0 +1,26 @@ +Zstd-jni: JNI bindings to Zstd Library + +Copyright (c) 2015-present, Luben Karavelov/ All rights reserved. + +BSD License + +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. + +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 HOLDER 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. \ No newline at end of file diff --git a/client-spark/spark-2-shaded/src/main/resources/META-INF/LICENSE b/client-spark/spark-2-shaded/src/main/resources/META-INF/LICENSE index 0441af2ac..924ef2c85 100644 --- a/client-spark/spark-2-shaded/src/main/resources/META-INF/LICENSE +++ b/client-spark/spark-2-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,8 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,23 +226,23 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.roaringbitmap:RoaringBitmap BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java diff --git a/client-spark/spark-3-shaded/src/main/resources/META-INF/LICENSE b/client-spark/spark-3-shaded/src/main/resources/META-INF/LICENSE index a8c58e532..f96af536a 100644 --- a/client-spark/spark-3-shaded/src/main/resources/META-INF/LICENSE +++ b/client-spark/spark-3-shaded/src/main/resources/META-INF/LICENSE @@ -208,7 +208,8 @@ This project bundles the following dependencies under the Apache License 2.0 (ht Apache License 2.0 -------------------------------------- -org.apache.commons:commons-lang3 +com.google.guava:failureaccess +com.google.guava:guava io.netty:netty-all io.netty:netty-buffer io.netty:netty-codec @@ -225,23 +226,23 @@ io.netty:netty-codec-stomp io.netty:netty-codec-xml io.netty:netty-common io.netty:netty-handler -io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy io.netty:netty-resolver io.netty:netty-resolver-dns io.netty:netty-transport -io.netty:netty-transport-rxtx -io.netty:netty-transport-sctp -io.netty:netty-transport-udt io.netty:netty-transport-classes-epoll io.netty:netty-transport-classes-kqueue io.netty:netty-transport-native-epoll io.netty:netty-transport-native-kqueue -com.google.guava:guava +io.netty:netty-transport-native-unix-common +io.netty:netty-transport-rxtx +io.netty:netty-transport-sctp +io.netty:netty-transport-udt +org.apache.commons:commons-lang3 org.roaringbitmap:RoaringBitmap BSD 3-clause ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java \ No newline at end of file diff --git a/licenses-binary/LISENCE-jdktools.txt b/licenses-binary/LICENSE-jdktools.txt similarity index 100% rename from licenses-binary/LISENCE-jdktools.txt rename to licenses-binary/LICENSE-jdktools.txt diff --git a/licenses-binary/LISENCE-slf4j.txt b/licenses-binary/LICENSE-slf4j.txt similarity index 100% rename from licenses-binary/LISENCE-slf4j.txt rename to licenses-binary/LICENSE-slf4j.txt