This is an automated email from the ASF dual-hosted git repository.

weibin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-graphar.git


The following commit(s) were added to refs/heads/main by this push:
     new 986c877  fix(license): fix LICENSE and NOTICE file according to ASF 
policy (#480)
986c877 is described below

commit 986c87796d6652c1cbd5546abcb537ee5b634332
Author: Weibin Zeng <[email protected]>
AuthorDate: Tue May 14 09:59:21 2024 +0800

    fix(license): fix LICENSE and NOTICE file according to ASF policy (#480)
    
    * fix(license): fix LICENSE and NOTICE file according to ASF policy
    
    Signed-off-by: acezen <[email protected]>
    
    * Remove the notice text of 3rd-party dependencies which not contain NOTICE 
file
    
    Signed-off-by: acezen <[email protected]>
    
    * Add version to 3rd-party code, licenses may change over time
    
    ---------
    
    Signed-off-by: acezen <[email protected]>
---
 LICENSE | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NOTICE  | 90 ++++++++++-------------------------------------------------------
 2 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/LICENSE b/LICENSE
index 261eeb9..b851baa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,83 @@
    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 includes a number of dependencies with separate license terms.
+Your use of these submodules is subject to the terms and conditions of the 
+following licenses.
+================================================================
+
+================================================================
+Apache-2.0 licenses
+================================================================
+The following components are provided under the Apache-2.0 License. See 
project link for details.
+The text of each license is the standard Apache 2.0 license.
+
+* spark 3.1.1 and 3.3.4 (https://github.com/apache/spark)
+    Files:
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarCommitProtocol.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarDataSource.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarScan.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarScanBuilder.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarScanTable.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarWriteBuilder.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/csv/CSVWriterBuilder.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/orc/ORCOutputWriter.scala
+      
maven-projects/spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/orc/ORCWriteBuilder.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/parquet/ParquetWriteBuilder.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarCommitProtocol.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarDataSource.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarScan.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarScanBuilder.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarScanTable.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarWriteBuilder.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/csv/CSVWriterBuilder.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/orc/ORCOutputWriter.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/orc/ORCWriteBuilder.scala
+      
maven-projects/spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/parquet/ParquetWriteBuilder.scala
+    are modified from spark.
+
+* arrow 12.0.0 (https://github.com/apache/arrow)
+* fastFFI v0.1.2 (https://github.com/alibaba/fastFFI)
+    Files:
+      
maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdString.java
+    are modified from fastFFI.
+
+* GraphScope v0.25.0 (https://github.com/alibaba/GraphScope)
+    Files:
+      
maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdVector.java
+      maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdMap.java
+      
maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java
+      
maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java
+      maven-projects/java/build.xml
+    are modified from GraphScope.
+
+================================================================
+MIT licenses
+================================================================
+The following components are provided under the MIT License. See project link 
for details.
+The text of each license is also included in licenses/LICENSE-[project].txt
+
+* result v0.1.0 (https://github.com/bitwizeshift/result)
+    Files:
+      cpp/thirdparty/result.hpp is modified from result.
+
+* mini-yaml commit-22d3dc (https://github.com/jimmiebergmann/mini-yaml)
+    Files:
+      cpp/thirdparty/mini-yam/Yaml.hpp
+      cpp/thirdparty/mini-yaml/Yaml.cpp
+
+* simple-uri-parser commit-bf7b037 
(https://github.com/jholloc/simple-uri-parser)
+    Files:
+      cpp/thirdparty/simple-uri-parser/uri_parser.h
+
+================================================================
+BSD 3-Clause licenses
+================================================================
+The following components are provided under the BSD 3-Clause License. See 
project link for details.
+The text of each license is also included in licenses/LICENSE-[project].txt
+
+* cpplint 1.5.4 (https://github.com/cpplint/cpplint)
+    Files:
+      cpp/misc/cpplint.py
diff --git a/NOTICE b/NOTICE
index 32777bf..7f83b38 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,86 +4,22 @@ Copyright 2024 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-================================================================
+This product includes software from Apache Arrow project (Apache 2.0)
+  * Apache Arrow
+  * Copyright 2016-2019 The Apache Software Foundation
 
-This product includes a number of Dependencies with separate copyright notices
-and license terms. Your use of these submodules is subject to the terms and
-conditions of the following licenses.
+--------------------------------------------------------------------------------
 
-================================================================
+This product includes code from Apache Spark, which includes the following in
+its NOTICE file:
 
-================================================================
-Apache-2.0 licenses
-================================================================
-The following components are provided under the Apache-2.0 License. See 
project link for details.
-The text of each license is the standard Apache 2.0 license.
+  Apache Spark
+  Copyright 2014 and onwards The Apache Software Foundation.
 
-* spark (https://github.com/apache/spark)
-    Files:
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarCommitProtocol.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarDataSource.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarScan.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarScanBuilder.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarScanTable.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/GarWriteBuilder.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/csv/CSVWriterBuilder.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/orc/ORCOutputWriter.scala
-      
spark/datasourcs-32/src/main/scala/org/apache/graphar/datasources/orc/ORCWriteBuilder.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/parquet/ParquetWriteBuilder.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarCommitProtocol.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarDataSource.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarScan.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarScanBuilder.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarScanTable.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/GarWriteBuilder.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/csv/CSVWriterBuilder.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/orc/ORCOutputWriter.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/orc/ORCWriteBuilder.scala
-      
spark/datasourcs-33/src/main/scala/org/apache/graphar/datasources/parquet/ParquetWriteBuilder.scala
-    are modified from spark.
+--------------------------------------------------------------------------------
 
-* arrow (https://github.com/apache/arrow)
-* fastFFI (https://github.org/apache/fastFFI)
-    Files:
-      java/src/main/java/org/apache/graphar/stdcxx/StdString.java
-    are modified from fastFFI.
+This product includes code from https://github.com/alibaba/GraphScope (Apache 
2.0),
+which includes the following in its NOTICE file:
 
-* GraphScope (https://github.org/apache/GraphScope)
-    Files:
-      java/src/main/java/org/apache/graphar/stdcxx/StdVector.java
-      java/src/main/java/org/apache/graphar/stdcxx/StdMap.java
-      java/src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java
-      java/src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java
-      java/build.xml
-    are modified from GraphScope.
-
-
-================================================================
-MIT licenses
-================================================================
-The following components are provided under the MIT License. See project link 
for details.
-The text of each license is also included in licenses/LICENSE-[project].txt
-
-* result (https://github.com/bitwizeshift/result)
-    Files:
-      cpp/thirdparty/result.hpp is modified from result.
-
-* mini-yaml (https://github.com/jimmiebergmann/mini-yaml)
-    Files:
-      cpp/thirdparty/mini-yam/Yaml.hpp
-      cpp/thirdparty/mini-yaml/Yaml.cpp
-
-* simple-uri-parser (https://github.com/jholloc/simple-uri-parser)
-    Files:
-      cpp/thirdparty/simple-uri-parser/uri_parser.h
-
-
-================================================================
-BSD 3-Clause licenses
-================================================================
-The following components are provided under the BSD 3-Clause License. See 
project link for details.
-The text of each license is also included in licenses/LICENSE-[project].txt
-
-* cpplint (https://github.com/cpplint/cpplint)
-    Files:
-      cpp/misc/cpplint.py
+  GraphScope
+  Copyright 2020 Alibaba Group Holding Limited. 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to