You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2022/11/08 16:48:37 UTC

[incubator-hugegraph] branch mac-m1-jna-fix created (now 88eac4805)

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

jermy pushed a change to branch mac-m1-jna-fix
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git


      at 88eac4805 mac m1: fix JNA link error by upgrade to v5.12.1

This branch includes the following new commits:

     new 88eac4805 mac m1: fix JNA link error by upgrade to v5.12.1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-hugegraph] 01/01: mac m1: fix JNA link error by upgrade to v5.12.1

Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jermy pushed a commit to branch mac-m1-jna-fix
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git

commit 88eac4805927000ed07b6e32c566feb2d184007d
Author: Zhangmei Li <li...@baidu.com>
AuthorDate: Wed Nov 9 00:45:32 2022 +0800

    mac m1: fix JNA link error by upgrade to v5.12.1
    
    Change-Id: I266fbeebb53c8cab0d5c13a95681b364edc8f32d
---
 hugegraph-core/pom.xml | 62 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml
index ded15fda5..08bc783aa 100644
--- a/hugegraph-core/pom.xml
+++ b/hugegraph-core/pom.xml
@@ -31,6 +31,7 @@
         <top.level.dir>${basedir}/..</top.level.dir>
         <jraft.version>1.3.11</jraft.version>
         <ohc.version>0.7.4</ohc.version>
+        <jna.version>5.12.1</jna.version>
         <lz4.version>1.8.0</lz4.version>
         <mmseg4j-core.version>1.10.0</mmseg4j-core.version>
         <jcseg.version>2.6.2</jcseg.version>
@@ -112,6 +113,7 @@
             </exclusions>
         </dependency>
 
+        <!-- ohc -->
         <dependency>
             <groupId>org.caffinitas.ohc</groupId>
             <artifactId>ohc-core</artifactId>
@@ -121,9 +123,43 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
+        </dependency>
+
+        <!-- collections -->
+        <dependency>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections-api</artifactId>
+            <version>${eclipse-collections.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections</artifactId>
+            <version>${eclipse-collections.version}</version>
+        </dependency>
+
+        <!-- compress -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>${commons-compress.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.lz4</groupId>
+            <artifactId>lz4-java</artifactId>
+            <version>${lz4.version}</version>
+        </dependency>
 
+        <!-- analyzers -->
         <dependency>
             <groupId>org.ansj</groupId>
             <artifactId>ansj_seg</artifactId>
@@ -165,34 +201,14 @@
             <version>${ikanalyzer.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.lz4</groupId>
-            <artifactId>lz4-java</artifactId>
-            <version>${lz4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>${commons-compress.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections-api</artifactId>
-            <version>${eclipse-collections.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections</artifactId>
-            <version>${eclipse-collections.version}</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
+        <!-- fastutil: https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
         <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
             <version>${fastutil.version}</version>
         </dependency>
-        <!-- jwt auth token TODO: move to auth pom -->
+
+        <!-- jwt auth token, TODO: move to auth pom -->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>