From b066b805630ca591809cfee2da2aae1395fc6b42 Mon Sep 17 00:00:00 2001
From: Dandelion <49650772+aroundabout@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:21:43 +0800
Subject: [PATCH] chore(client): increase the api num as the latest server
 commit + 10 (#546)

* fix: the api version is outdated

* fix dockerfile to aviod hubble use client:1.0.0

* Update hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java

* fix: increase the depth for git clone

* Update hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java
---
 .github/workflows/client-ci.yml                               | 2 +-
 .../assembly/travis/install-hugegraph-from-source.sh          | 2 +-
 .../src/main/java/org/apache/hugegraph/driver/HugeClient.java | 4 +++-
 hugegraph-hubble/Dockerfile                                   | 3 +++
 .../hubble-dist/assembly/travis/download-hugegraph.sh         | 2 +-
 .../assembly/travis/install-hugegraph-from-source.sh          | 2 +-
 .../assembly/travis/install-hugegraph-from-source.sh          | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml
index e414921d1..f1448f807 100644
--- a/.github/workflows/client-ci.yml
+++ b/.github/workflows/client-ci.yml
@@ -69,6 +69,6 @@ jobs:
           mvn test -Dtest=FuncTestSuite
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
+        uses: codecov/codecov-action@v3
         with:
           file: target/jacoco.xml
diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
index fe9024077..df912fb0a 100755
--- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
@@ -26,7 +26,7 @@ HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
 GIT_DIR=hugegraph
 
 # download code and compile
-git clone --depth 100 ${HUGEGRAPH_GIT_URL} $GIT_DIR
+git clone --depth 150 ${HUGEGRAPH_GIT_URL} $GIT_DIR
 cd "${GIT_DIR}"
 git checkout "${COMMIT_ID}"
 mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
diff --git a/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java
index e3c9045bf..caa48586d 100644
--- a/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java
+++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java
@@ -109,7 +109,9 @@ private void initManagers(RestClient client, String graph) {
 
     private void checkServerApiVersion() {
         VersionUtil.Version apiVersion = VersionUtil.Version.of(this.version.getApiVersion());
-        VersionUtil.check(apiVersion, "0.38", "0.70", "hugegraph-api in server");
+        // TODO: find a way to keep the range of api version correct automatically
+        // 0.81 equals to the {latest_api_version} +10  
+        VersionUtil.check(apiVersion, "0.38", "0.81", "hugegraph-api in server");
         this.client.apiVersion(apiVersion);
     }
 
diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile
index 4518d82f9..2ae677a63 100644
--- a/hugegraph-hubble/Dockerfile
+++ b/hugegraph-hubble/Dockerfile
@@ -26,6 +26,9 @@ RUN set -x \
 COPY . /pkg
 WORKDIR /pkg
 
+RUN set -x \
+    && mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp
+
 RUN set -x \
     && cd /pkg/hugegraph-hubble/ \
     && mvn package -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true
diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
index 7813cc3ba..38a7032c0 100755
--- a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
@@ -26,7 +26,7 @@ HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
 GIT_DIR=hugegraph
 
 # download code and compile
-git clone --depth 100 $HUGEGRAPH_GIT_URL $GIT_DIR
+git clone --depth 150 $HUGEGRAPH_GIT_URL $GIT_DIR
 cd "${GIT_DIR}"
 git checkout "${COMMIT_ID}"
 mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
index 60adcfacd..202f45691 100755
--- a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
@@ -24,7 +24,7 @@ fi
 COMMIT_ID=$1
 HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
 
-git clone --depth 100 ${HUGEGRAPH_GIT_URL} hugegraph
+git clone --depth 150 ${HUGEGRAPH_GIT_URL} hugegraph
 cd hugegraph
 git checkout "${COMMIT_ID}"
 mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
diff --git a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
index 5b3b2637c..45de8924c 100755
--- a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
@@ -25,7 +25,7 @@ HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
 GIT_DIR=hugegraph
 
 # download code and compile
-git clone --depth 100 $HUGEGRAPH_GIT_URL $GIT_DIR
+git clone --depth 150 $HUGEGRAPH_GIT_URL $GIT_DIR
 cd "${GIT_DIR}"
 git checkout "${COMMIT_ID}"
 mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp