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 0136d16 fix(license): add reference code to java related third-party
code (#485)
0136d16 is described below
commit 0136d165a0ead95a7b19dbe28e2c2e6116cbc6d3
Author: Weibin Zeng <[email protected]>
AuthorDate: Mon May 20 16:57:35 2024 +0800
fix(license): add reference code to java related third-party code (#485)
* fix(license): merging ASF licence header and Alibaba Group copyright if
the code has been modified on top of reference code
Signed-off-by: acezen <[email protected]>
* Update
* Update NOTICE
---------
Signed-off-by: acezen <[email protected]>
---
LICENSE | 2 +-
NOTICE | 8 ++++++++
maven-projects/java/build.xml | 5 +++++
.../java/src/main/java/org/apache/graphar/stdcxx/StdMap.java | 3 +++
.../src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java | 3 +++
.../java/src/main/java/org/apache/graphar/stdcxx/StdString.java | 3 +++
.../src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java | 4 ++--
.../java/src/main/java/org/apache/graphar/stdcxx/StdVector.java | 3 +++
8 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index b851baa..d1d8cf7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -240,6 +240,7 @@ The text of each license is the standard Apache 2.0 license.
* fastFFI v0.1.2 (https://github.com/alibaba/fastFFI)
Files:
maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdString.java
+ maven-projects/java/build.xml
are modified from fastFFI.
* GraphScope v0.25.0 (https://github.com/alibaba/GraphScope)
@@ -248,7 +249,6 @@ The text of each license is the standard Apache 2.0 license.
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.
================================================================
diff --git a/NOTICE b/NOTICE
index 7f83b38..cb5fbb1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -23,3 +23,11 @@ which includes the following in its NOTICE file:
GraphScope
Copyright 2020 Alibaba Group Holding Limited.
+
+--------------------------------------------------------------------------------
+
+This product includes code from https://github.com/alibaba/fastFFI (Apache
2.0),
+which includes the following in its NOTICE file:
+
+ fastFFI
+ Copyright 1999-2021 Alibaba Group Holding Ltd.
diff --git a/maven-projects/java/build.xml b/maven-projects/java/build.xml
index 5a95afd..032623e 100644
--- a/maven-projects/java/build.xml
+++ b/maven-projects/java/build.xml
@@ -14,6 +14,11 @@
~ limitations under the License.
-->
+<!--
+ ~ Derived from alibaba/fastFFI v0.1.2
+ ~ https://github.com/alibaba/fastFFI/blob/1eca42b/build.xml
+-->
+
<project name="llvm4jni">
<target name="make">
<echo message="Make native code" level="info"/>
diff --git
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdMap.java
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdMap.java
index 486e893..da65a37 100644
--- a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdMap.java
+++ b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdMap.java
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+// Derived from alibaba/GraphScope v0.25.0
+//
https://github.com/alibaba/GraphScope/blob/8235b29/analytical_engine/java/grape-jdk/src/main/java/com/alibaba/graphscope/stdcxx/StdVector.java
+
package org.apache.graphar.stdcxx;
import static org.apache.graphar.util.CppClassName.GAR_EDGE_INFO;
diff --git
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java
index 9728b63..82bc787 100644
---
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java
+++
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdSharedPtr.java
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+// Derived from alibaba/GraphScope v0.25.0
+//
https://github.com/alibaba/GraphScope/blob/8235b29/analytical_engine/java/grape-jdk/src/main/java/com/alibaba/graphscope/stdcxx/StdSharedPtr.java
+
package org.apache.graphar.stdcxx;
import static org.apache.graphar.util.CppClassName.ARROW_ARRAY;
diff --git
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdString.java
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdString.java
index 102ec85..4532657 100644
--- a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdString.java
+++ b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdString.java
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+// Derived from alibaba/fastFFI v0.1.2
+//
https://github.com/alibaba/fastFFI/blob/1eca42b/llvm/src/main/java/com/alibaba/fastffi/stdcxx/StdString.java
+
package org.apache.graphar.stdcxx;
import com.alibaba.fastffi.CXXHead;
diff --git
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java
index c8a24a6..572956a 100644
---
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java
+++
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdUnorderedMap.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-// Derived from GraphScope v0.22.0
-//
https://github.com/alibaba/GraphScope/blob/99c9d15d/analytical_engine/java/grape-jdk/src/main/java/com/alibaba/graphscope/stdcxx/StdUnorderedMap.java
+// Derived from alibaba/GraphScope v0.25.0
+//
https://github.com/alibaba/GraphScope/blob/8235b29/analytical_engine/java/grape-jdk/src/main/java/com/alibaba/graphscope/stdcxx/StdUnorderedMap.java
package org.apache.graphar.stdcxx;
diff --git
a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdVector.java
b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdVector.java
index 23504c4..94f6ed2 100644
--- a/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdVector.java
+++ b/maven-projects/java/src/main/java/org/apache/graphar/stdcxx/StdVector.java
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+// Derived from alibaba/GraphScope v0.25.0
+//
https://github.com/alibaba/GraphScope/blob/8235b29/analytical_engine/java/grape-jdk/src/main/java/com/alibaba/graphscope/stdcxx/StdMap.java
+
package org.apache.graphar.stdcxx;
import static org.apache.graphar.util.CppClassName.GAR_PROPERTY;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
