This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch branch-0.4
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/branch-0.4 by this push:
new 9308ea654 [CELEBORN-1250][FOLLOWUP] Fix license issues
9308ea654 is described below
commit 9308ea654f28d0e7d8d917d5fd6400a2f2d0fc45
Author: mingji <[email protected]>
AuthorDate: Mon Jan 29 19:46:14 2024 +0800
[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 <[email protected]>
Co-authored-by: Ethan Feng <[email protected]>
Signed-off-by: mingji <[email protected]>
---
LICENSE | 5 ++---
LICENSE-binary | 12 ++++++------
.../flink-1.14-shaded/src/main/resources/META-INF/LICENSE | 2 +-
.../flink-1.15-shaded/src/main/resources/META-INF/LICENSE | 2 +-
.../flink-1.17-shaded/src/main/resources/META-INF/LICENSE | 2 +-
.../flink-1.18-shaded/src/main/resources/META-INF/LICENSE | 2 +-
client-mr/mr-shaded/src/main/resources/META-INF/LICENSE | 4 ++--
.../spark-2-shaded/src/main/resources/META-INF/LICENSE | 2 +-
.../spark-3-shaded/src/main/resources/META-INF/LICENSE | 2 +-
.../{LISENCE-jdktools.txt => LICENSE-jdktools.txt} | 0
licenses-binary/{LISENCE-slf4j.txt => LICENSE-slf4j.txt} | 0
11 files changed, 16 insertions(+), 17 deletions(-)
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 05eae7496..945016f5b 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 3b88b927c..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
@@ -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 3b88b927c..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
@@ -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 3b88b927c..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
@@ -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 3b88b927c..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
@@ -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 7b11acb0e..ec665dcc8 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 3b88b927c..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
@@ -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 2c84299eb..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
@@ -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
