From 9308ea654f28d0e7d8d917d5fd6400a2f2d0fc45 Mon Sep 17 00:00:00 2001 From: mingji Date: Mon, 29 Jan 2024 19:46:14 +0800 Subject: [PATCH] [CELEBORN-1250][FOLLOWUP] Fix license issues ### What changes were proposed in this pull request? Fix license issues. ### Why are the changes needed? ### Does this PR introduce _any_ user-facing change? NO. ### How was this patch tested? GA. Closes #2268 from FMX/b1250-2. Lead-authored-by: mingji Co-authored-by: Ethan Feng Signed-off-by: mingji --- LICENSE | 5 ++--- LICENSE-binary | 12 ++++++------ .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../mr-shaded/src/main/resources/META-INF/LICENSE | 4 ++-- .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../{LISENCE-jdktools.txt => LICENSE-jdktools.txt} | 0 .../{LISENCE-slf4j.txt => LICENSE-slf4j.txt} | 0 11 files changed, 16 insertions(+), 17 deletions(-) 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 1783e11c47..865b656dac 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 05eae74968..945016f5ba 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -284,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/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 3b88b927ca..924ef2c85f 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 @@ -244,5 +244,5 @@ 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 3b88b927ca..924ef2c85f 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 @@ -244,5 +244,5 @@ 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 3b88b927ca..924ef2c85f 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 @@ -244,5 +244,5 @@ 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 3b88b927ca..924ef2c85f 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 @@ -244,5 +244,5 @@ 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 7b11acb0ef..ec665dcc83 100644 --- a/client-mr/mr-shaded/src/main/resources/META-INF/LICENSE +++ b/client-mr/mr-shaded/src/main/resources/META-INF/LICENSE @@ -247,7 +247,7 @@ org.scala-lang:scala-library BSD ------------ -See license/LICENSE-protobuf.txt for details. +See licenses/LICENSE-protobuf.txt for details. com.google.protobuf:protobuf-java -See license/LICENSE-zstd-jni.txt for details. +See licenses/LICENSE-zstd-jni.txt for details. com.github.luben:zstd-jni 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 3b88b927ca..924ef2c85f 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 @@ -244,5 +244,5 @@ 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 2c84299ebc..f96af536a1 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 @@ -244,5 +244,5 @@ 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