From b895b1a5261d62d4aba4fa1b26d4335510d11cd7 Mon Sep 17 00:00:00 2001
From: coderzc <zc1217zc@126.com>
Date: Mon, 24 Jan 2022 19:50:47 +0800
Subject: [PATCH] update hugegraph-client & hugegraph-rpc & hugegraph-common
 version (#180)

---
 .github/workflows/ci.yml                      |  2 +-
 computer-algorithm/pom.xml                    |  8 +--
 computer-api/pom.xml                          |  3 +-
 computer-core/pom.xml                         | 16 +----
 computer-dist/pom.xml                         |  2 +-
 computer-driver/pom.xml                       | 11 +--
 computer-k8s-operator/pom.xml                 |  2 +-
 computer-k8s/pom.xml                          |  2 +-
 computer-test/pom.xml                         |  2 +-
 .../computer/suite/unit/UnitTestBase.java     |  2 +-
 computer-yarn/pom.xml                         |  2 +-
 pom.xml                                       | 67 +++++++++++++++----
 12 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9710d25ec..2c4e58ec3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Prepare env and service
         env:
           TRAVIS_DIR: computer-dist/src/assembly/travis
-          COMMIT_ID: e65641517361d7da7ef1801489c15e3af7863a39
+          COMMIT_ID: 848b8fb17804ddc561af832dff0bdc3f6221c904
         run: |
           $TRAVIS_DIR/install-env.sh
           $TRAVIS_DIR/install-hugegraph-from-source.sh $COMMIT_ID | grep -v "Downloading\|Downloaded"
diff --git a/computer-algorithm/pom.xml b/computer-algorithm/pom.xml
index 9819f6c88..29208328b 100644
--- a/computer-algorithm/pom.xml
+++ b/computer-algorithm/pom.xml
@@ -5,18 +5,14 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>computer-algorithm</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.baidu.hugegraph</groupId>
-            <artifactId>computer-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!-- TODO improve structure to only import computer-api -->
         <dependency>
             <groupId>com.baidu.hugegraph</groupId>
             <artifactId>computer-core</artifactId>
diff --git a/computer-api/pom.xml b/computer-api/pom.xml
index a8a59a1db..d997d078b 100644
--- a/computer-api/pom.xml
+++ b/computer-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,5 +17,4 @@
             <artifactId>hugegraph-client</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/computer-core/pom.xml b/computer-core/pom.xml
index 631124dd9..120f340c2 100644
--- a/computer-core/pom.xml
+++ b/computer-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,18 +17,10 @@
             <artifactId>computer-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.baidu.hugegraph</groupId>
-            <artifactId>hugegraph-common</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.baidu.hugegraph</groupId>
             <artifactId>hugegraph-rpc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.baidu.hugegraph</groupId>
-            <artifactId>hugegraph-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
@@ -45,12 +37,6 @@
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>protobuf-java</artifactId>
-                    <groupId>com.google.protobuf</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
diff --git a/computer-dist/pom.xml b/computer-dist/pom.xml
index a0cdf42b0..bea42c22e 100644
--- a/computer-dist/pom.xml
+++ b/computer-dist/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/computer-driver/pom.xml b/computer-driver/pom.xml
index 1486162b5..ee9d0e76f 100644
--- a/computer-driver/pom.xml
+++ b/computer-driver/pom.xml
@@ -5,17 +5,10 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <version>0.1.3</version>
 
     <artifactId>computer-driver</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.baidu.hugegraph</groupId>
-            <artifactId>hugegraph-common</artifactId>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/computer-k8s-operator/pom.xml b/computer-k8s-operator/pom.xml
index 54c36570d..2d0497392 100644
--- a/computer-k8s-operator/pom.xml
+++ b/computer-k8s-operator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/computer-k8s/pom.xml b/computer-k8s/pom.xml
index 58753365e..59205f597 100644
--- a/computer-k8s/pom.xml
+++ b/computer-k8s/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/computer-test/pom.xml b/computer-test/pom.xml
index dbee66d9f..07dd9d1f7 100644
--- a/computer-test/pom.xml
+++ b/computer-test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/computer-test/src/main/java/com/baidu/hugegraph/computer/suite/unit/UnitTestBase.java b/computer-test/src/main/java/com/baidu/hugegraph/computer/suite/unit/UnitTestBase.java
index a2d518c5a..2f1e7b524 100644
--- a/computer-test/src/main/java/com/baidu/hugegraph/computer/suite/unit/UnitTestBase.java
+++ b/computer-test/src/main/java/com/baidu/hugegraph/computer/suite/unit/UnitTestBase.java
@@ -70,7 +70,7 @@ public class UnitTestBase {
     private static HugeClient CLIENT = null;
 
     protected static void clearAll() {
-        client().graphs().clear(GRAPH, "I'm sure to delete all data");
+        client().graphs().clearGraph(GRAPH, "I'm sure to delete all data");
     }
 
     public static void assertIdEqualAfterWriteAndRead(Id oldId)
diff --git a/computer-yarn/pom.xml b/computer-yarn/pom.xml
index 9ca4e547d..de2788dc1 100644
--- a/computer-yarn/pom.xml
+++ b/computer-yarn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hugegraph-computer</artifactId>
         <groupId>com.baidu.hugegraph</groupId>
-        <version>0.1.3</version>
+        <version>0.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 853db473a..219861817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baidu.hugegraph</groupId>
     <artifactId>hugegraph-computer</artifactId>
-    <version>0.1.3</version>
+    <version>0.1.4</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.3.9</maven>
@@ -66,12 +66,12 @@
             <dependency>
                 <groupId>com.baidu.hugegraph</groupId>
                 <artifactId>hugegraph-common</artifactId>
-                <version>1.8.9</version>
+                <version>2.0.1</version>
             </dependency>
             <dependency>
                 <groupId>com.baidu.hugegraph</groupId>
                 <artifactId>hugegraph-rpc</artifactId>
-                <version>1.0.1</version>
+                <version>2.0.1</version>
                 <exclusions>
                     <!-- conflict with etcd -->
                     <exclusion>
@@ -83,7 +83,7 @@
             <dependency>
                 <groupId>com.baidu.hugegraph</groupId>
                 <artifactId>hugegraph-client</artifactId>
-                <version>1.9.6</version>
+                <version>2.0.1</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -110,11 +110,43 @@
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-common</artifactId>
                 <version>${hadoop-version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.protobuf</groupId>
+                        <artifactId>protobuf-java</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.ws.rs</groupId>
+                        <artifactId>jsr311-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-hdfs-client</artifactId>
                 <version>${hadoop-version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.baidu.hugegraph</groupId>
@@ -122,50 +154,57 @@
                 <version>0.12.0</version>
                 <exclusions>
                     <exclusion>
-                        <artifactId>hive-exec</artifactId>
                         <groupId>org.apache.hive</groupId>
+                        <artifactId>hive-exec</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>httpclient</artifactId>
                         <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>hugegraph-client</artifactId>
                         <groupId>com.baidu.hugegraph</groupId>
+                        <artifactId>hugegraph-client</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>mssql-jdbc</artifactId>
                         <groupId>com.microsoft.sqlserver</groupId>
+                        <artifactId>mssql-jdbc</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>mysql-connector-java</artifactId>
                         <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>ojdbc8</artifactId>
                         <groupId>com.oracle</groupId>
+                        <artifactId>ojdbc8</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>postgresql</artifactId>
                         <groupId>org.postgresql</groupId>
+                        <artifactId>postgresql</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>hadoop-hdfs-client</artifactId>
                         <groupId>org.apache.hadoop</groupId>
+                        <artifactId>hadoop-hdfs-client</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>hadoop-common</artifactId>
                         <groupId>org.apache.hadoop</groupId>
+                        <artifactId>hadoop-common</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>guava</artifactId>
                         <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.baidu.hugegraph</groupId>
+            <artifactId>hugegraph-common</artifactId>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>