This is an automated email from the ASF dual-hosted git repository. ethanfeng pushed a commit to branch branch-0.2 in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
commit 4e93acb2665b93fefe2b015243e58b791c59af25 Author: Ethan Feng <[email protected]> AuthorDate: Thu Feb 2 10:52:11 2023 +0800 [CELEBORN-224][FOLLOWUP] Correct license and notices. (#1189) (cherry picked from commit a43e3141bc58188b3ef26887c78cf94b5e2905df) --- .scalafmt.conf | 17 +++++++++++++++++ LICENSE | 12 ++++++++++++ NOTICE | 3 +++ NOTICE-binary | 15 ++++++++------- .../network/server/memory/ReadBufferListener.java | 13 +++++++------ 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index d82ea07c..2df0e202 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# + version = 3.1.1 runner.dialect=scala212 project.git=true diff --git a/LICENSE b/LICENSE index 261eeb9e..07b27d9b 100644 --- a/LICENSE +++ b/LICENSE @@ -199,3 +199,15 @@ 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. + + +------------------------------------------------------------------------------------ +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. + + +Apache Software Foundation License 2.0 +-------------------------------------- + +common/src/main/java/org/apache/celeborn/common/network/util/LimitedInputStream.java diff --git a/NOTICE b/NOTICE index b1dcec68..3ebd6642 100644 --- a/NOTICE +++ b/NOTICE @@ -5,3 +5,6 @@ Copyright 2022-2023 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 + diff --git a/NOTICE-binary b/NOTICE-binary index 1f4700cd..4757bfa6 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -26,15 +26,10 @@ Copyright 1999-2022 The Apache Software Foundation Apache Log4j API Copyright 1999-2022 The Apache Software Foundation + Apache Log4j Core Copyright 1999-2012 Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -ResolverUtil.java -Copyright 2005-2006 Tim Fennell - Apache Log4j SLF4J Binding Copyright 1999-2022 The Apache Software Foundation @@ -63,4 +58,10 @@ Apache Ratis Server API Copyright 2017-2020 The Apache Software Foundation Apache Ratis Thirdparty Miscellaneous -Copyright 2017-2020 The Apache Software Foundation \ No newline at end of file +Copyright 2017-2020 The Apache Software Foundation + +Apache Spark +Copyright 2014 and onwards The Apache Software Foundation + +ResolverUtil.java +Copyright 2005-2006 Tim Fennell diff --git a/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java b/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java index 8ecc3d22..1321d3db 100644 --- a/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java +++ b/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java @@ -1,11 +1,12 @@ /* - * Copyright 2021 The Flink Remote Shuffle Project + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 * - * 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 + * 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,
