This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new bb8607416 [CELEBORN-1202][FOLLOWUP] Update LICENSE and NOTICE files
bb8607416 is described below
commit bb86074163ca184c197a61ad206dbb98e6bb021d
Author: Cheng Pan <[email protected]>
AuthorDate: Wed Jan 10 19:26:54 2024 +0800
[CELEBORN-1202][FOLLOWUP] Update LICENSE and NOTICE files
### What changes were proposed in this pull request?
Update LICENSE and NOTICE files according to the mailing list comments.
### Why are the changes needed?
https://lists.apache.org/thread/zw5cw621dqgbktdolx7qynho0zt451pk
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Review.
Closes #2213 from pan3793/CELEBORN-1202-followup.
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
LICENSE | 2 ++
NOTICE | 26 ++++++++++++++
NOTICE-binary | 41 ++++++++++++++++++----
.../src/main/resources/META-INF/NOTICE | 32 +++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 32 +++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 32 +++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 32 +++++++++++++++++
.../mr-shaded/src/main/resources/META-INF/NOTICE | 29 +++++++++++++++
.../src/main/resources/META-INF/NOTICE | 29 +++++++++++++++
.../src/main/resources/META-INF/NOTICE | 29 +++++++++++++++
.../apache/celeborn/common/unsafe/Platform.java | 1 +
.../org/apache/celeborn/common/util/JavaUtils.java | 2 ++
.../org/apache/celeborn/reflect/DynClasses.java | 2 +-
.../apache/celeborn/reflect/DynConstructors.java | 2 +-
.../org/apache/celeborn/reflect/DynFields.java | 2 +-
.../org/apache/celeborn/reflect/DynMethods.java | 2 +-
16 files changed, 285 insertions(+), 10 deletions(-)
diff --git a/LICENSE b/LICENSE
index c01318dc4..1783e11c4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,6 +213,8 @@ Apache License 2.0
Apache Spark
./client-spark/spark-2/src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java
./client-spark/spark-3/src/main/java/org/apache/spark/shuffle/celeborn/SparkUtils.java
+./common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
+./common/src/main/java/org/apache/celeborn/common/util/JavaUtils.java
./worker/src/main/java/org/apache/celeborn/service/deploy/worker/shuffledb/DB.java
./worker/src/main/java/org/apache/celeborn/service/deploy/worker/shuffledb/DBIterator.java
./worker/src/main/java/org/apache/celeborn/service/deploy/worker/shuffledb/LevelDB.java
diff --git a/NOTICE b/NOTICE
index 4d1fe05cf..34ec3f608 100644
--- a/NOTICE
+++ b/NOTICE
@@ -11,5 +11,31 @@ Copyright 2014 and onwards The Apache Software Foundation
Apache Kyuubi
Copyright 2021-2023 The Apache Software Foundation
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
Remote Shuffle Service for Flink
Copyright 2021 The Flink Remote Shuffle Project
+
+This product includes software developed at The Alibaba Group Holding Ltd
+(https://www.alibaba.com/).
diff --git a/NOTICE-binary b/NOTICE-binary
index c698502c3..8f9a27eba 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -9,6 +9,41 @@ The Apache Software Foundation (https://www.apache.org/).
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
+Remote Shuffle Service for Flink
+Copyright 2021 The Flink Remote Shuffle Project
+
+This product includes software developed at The Alibaba Group Holding Ltd
+(https://www.alibaba.com/).
+
Apache Commons CLI
Copyright 2002-2021 The Apache Software Foundation
@@ -66,15 +101,9 @@ Copyright 2017-2020 The Apache Software Foundation
Apache Ratis Thirdparty Miscellaneous
Copyright 2017-2020 The Apache Software Foundation
-Apache Spark
-Copyright 2014 and onwards The Apache Software Foundation
-
ResolverUtil.java
Copyright 2005-2006 Tim Fennell
-Apache Flink
-Copyright 2014-2022 The Apache Software Foundation
-
Scala
Copyright (c) 2002-2023 EPFL
Copyright (c) 2011-2023 Lightbend, Inc.
diff --git a/client-flink/flink-1.14-shaded/src/main/resources/META-INF/NOTICE
b/client-flink/flink-1.14-shaded/src/main/resources/META-INF/NOTICE
index 8c0777dc8..63b5024b0 100644
--- a/client-flink/flink-1.14-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-flink/flink-1.14-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,38 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
+Remote Shuffle Service for Flink
+Copyright 2021 The Flink Remote Shuffle Project
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git a/client-flink/flink-1.15-shaded/src/main/resources/META-INF/NOTICE
b/client-flink/flink-1.15-shaded/src/main/resources/META-INF/NOTICE
index 8c0777dc8..63b5024b0 100644
--- a/client-flink/flink-1.15-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-flink/flink-1.15-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,38 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
+Remote Shuffle Service for Flink
+Copyright 2021 The Flink Remote Shuffle Project
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE
b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE
index 8c0777dc8..63b5024b0 100644
--- a/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-flink/flink-1.17-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,38 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
+Remote Shuffle Service for Flink
+Copyright 2021 The Flink Remote Shuffle Project
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git a/client-flink/flink-1.18-shaded/src/main/resources/META-INF/NOTICE
b/client-flink/flink-1.18-shaded/src/main/resources/META-INF/NOTICE
index 8c0777dc8..63b5024b0 100644
--- a/client-flink/flink-1.18-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-flink/flink-1.18-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,38 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
+Remote Shuffle Service for Flink
+Copyright 2021 The Flink Remote Shuffle Project
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git a/client-mr/mr-shaded/src/main/resources/META-INF/NOTICE
b/client-mr/mr-shaded/src/main/resources/META-INF/NOTICE
index 0d7827fa2..5b5319639 100644
--- a/client-mr/mr-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-mr/mr-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,35 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git a/client-spark/spark-2-shaded/src/main/resources/META-INF/NOTICE
b/client-spark/spark-2-shaded/src/main/resources/META-INF/NOTICE
index 3ada616be..1fd47fe3d 100644
--- a/client-spark/spark-2-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-spark/spark-2-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,35 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git a/client-spark/spark-3-shaded/src/main/resources/META-INF/NOTICE
b/client-spark/spark-3-shaded/src/main/resources/META-INF/NOTICE
index 3ada616be..1fd47fe3d 100644
--- a/client-spark/spark-3-shaded/src/main/resources/META-INF/NOTICE
+++ b/client-spark/spark-3-shaded/src/main/resources/META-INF/NOTICE
@@ -5,6 +5,35 @@ Copyright 2022-2024 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation
+
+Apache Kyuubi
+Copyright 2021-2023 The Apache Software Foundation
+
+Apache Iceberg
+Copyright 2017-2022 The Apache Software Foundation
+
+Apache Parquet MR
+Copyright 2014-2024 The Apache Software Foundation
+
+This project includes code from Kite, developed at Cloudera, Inc. with
+the following copyright notice:
+
+| Copyright 2013 Cloudera Inc.
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+| http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| 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.
+
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
diff --git
a/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
b/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
index c8673c518..ec541a770 100644
--- a/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
+++ b/common/src/main/java/org/apache/celeborn/common/unsafe/Platform.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
import sun.misc.Unsafe;
+/** this class is copied from Apache Spark */
public final class Platform {
private static final Unsafe _UNSAFE;
diff --git
a/common/src/main/java/org/apache/celeborn/common/util/JavaUtils.java
b/common/src/main/java/org/apache/celeborn/common/util/JavaUtils.java
index df032a5cb..32c53bcee 100644
--- a/common/src/main/java/org/apache/celeborn/common/util/JavaUtils.java
+++ b/common/src/main/java/org/apache/celeborn/common/util/JavaUtils.java
@@ -45,6 +45,8 @@ import org.apache.celeborn.common.network.util.ByteUnit;
/**
* General utilities available in the network package. Many of these are
sourced from Spark's own
* Utils, just accessible within this package.
+ *
+ * <p>Some methods of this class are copied from Apache Spark
*/
public class JavaUtils {
private static final Logger logger =
LoggerFactory.getLogger(JavaUtils.class);
diff --git a/common/src/main/java/org/apache/celeborn/reflect/DynClasses.java
b/common/src/main/java/org/apache/celeborn/reflect/DynClasses.java
index 546c0cf18..1646786df 100644
--- a/common/src/main/java/org/apache/celeborn/reflect/DynClasses.java
+++ b/common/src/main/java/org/apache/celeborn/reflect/DynClasses.java
@@ -22,7 +22,7 @@ package org.apache.celeborn.reflect;
import java.util.LinkedHashSet;
import java.util.Set;
-/** Copied from iceberg-common */
+/** this class is copied from Apache Kyuubi, derived from iceberg-common */
public class DynClasses {
private DynClasses() {}
diff --git
a/common/src/main/java/org/apache/celeborn/reflect/DynConstructors.java
b/common/src/main/java/org/apache/celeborn/reflect/DynConstructors.java
index 1c9390a04..85b812459 100644
--- a/common/src/main/java/org/apache/celeborn/reflect/DynConstructors.java
+++ b/common/src/main/java/org/apache/celeborn/reflect/DynConstructors.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-/** Copied from parquet-common */
+/** this class is copied from Apache Kyuubi, from derived parquet-common */
public class DynConstructors {
private DynConstructors() {}
diff --git a/common/src/main/java/org/apache/celeborn/reflect/DynFields.java
b/common/src/main/java/org/apache/celeborn/reflect/DynFields.java
index 6e738d1ab..a4e563d9f 100644
--- a/common/src/main/java/org/apache/celeborn/reflect/DynFields.java
+++ b/common/src/main/java/org/apache/celeborn/reflect/DynFields.java
@@ -28,7 +28,7 @@ import java.util.Set;
import org.apache.commons.lang3.builder.ToStringBuilder;
-/** Copied from iceberg-common */
+/** this class is copied from Apache Kyuubi, derived from iceberg-common */
public class DynFields {
private DynFields() {}
diff --git a/common/src/main/java/org/apache/celeborn/reflect/DynMethods.java
b/common/src/main/java/org/apache/celeborn/reflect/DynMethods.java
index e85a07b6c..3087f70bc 100644
--- a/common/src/main/java/org/apache/celeborn/reflect/DynMethods.java
+++ b/common/src/main/java/org/apache/celeborn/reflect/DynMethods.java
@@ -26,7 +26,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
-/** Copied from parquet-common */
+/** this class is copied from Apache Kyuubi, derived from parquet-common */
public class DynMethods {
private DynMethods() {}
