From 454373d4f17de7ce9d9f4f7ee2f97bee18f20873 Mon Sep 17 00:00:00 2001
From: imbajin <jin@apache.org>
Date: Wed, 6 Nov 2024 16:20:51 +0800
Subject: [PATCH] chore: update server

---
 .github/workflows/ci.yml                         |  2 +-
 .../scripts/dependency/known-dependencies.txt    | 16 ++++++++--------
 .../dependency/regenerate_known_dependencies.sh  |  6 +++---
 computer/pom.xml                                 |  3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0fe7aa5c..34332abec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       KUBERNETES_VERSION: 1.20.1
       BSP_ETCD_URL: http://localhost:2579
       # TODO: delete this env in the future (replaced by docker way now)
-      HUGEGRAPH_SERVER_COMMIT_ID: d01c8737d7d5909119671953521f1401dcd1a188
+      HUGEGRAPH_SERVER_COMMIT_ID: 2294d2abc2ef65e5b395cd8ab25bc6a12e38d4ae
 
     steps:
       - name: Checkout
diff --git a/computer/computer-dist/scripts/dependency/known-dependencies.txt b/computer/computer-dist/scripts/dependency/known-dependencies.txt
index 02c32880b..719447fa2 100644
--- a/computer/computer-dist/scripts/dependency/known-dependencies.txt
+++ b/computer/computer-dist/scripts/dependency/known-dependencies.txt
@@ -36,14 +36,14 @@ commons-logging-1.1.3.jar
 commons-math3-3.1.1.jar
 commons-net-3.6.jar
 commons-text-1.9.jar
-computer-algorithm-1.3.0.jar
-computer-api-1.3.0.jar
-computer-core-1.3.0.jar
-computer-dist-1.3.0.jar
-computer-driver-1.3.0.jar
-computer-k8s-1.3.0.jar
-computer-k8s-operator-1.3.0.jar
-computer-yarn-1.3.0.jar
+computer-algorithm-1.5.0.jar
+computer-api-1.5.0.jar
+computer-core-1.5.0.jar
+computer-dist-1.5.0.jar
+computer-driver-1.5.0.jar
+computer-k8s-1.5.0.jar
+computer-k8s-operator-1.5.0.jar
+computer-yarn-1.5.0.jar
 curator-client-2.13.0.jar
 curator-framework-2.13.0.jar
 curator-recipes-2.13.0.jar
diff --git a/computer/computer-dist/scripts/dependency/regenerate_known_dependencies.sh b/computer/computer-dist/scripts/dependency/regenerate_known_dependencies.sh
index b63e7b3a8..4bbe34efa 100644
--- a/computer/computer-dist/scripts/dependency/regenerate_known_dependencies.sh
+++ b/computer/computer-dist/scripts/dependency/regenerate_known_dependencies.sh
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-BASE_PATH=$(cd $(dirname $0); pwd)
+BASE_PATH=$(cd $(dirname $0) || exit; pwd)
 DEP_PATH=$BASE_PATH/all_dependencies
 FILE_NAME=${1:-known-dependencies.txt}
 
@@ -25,9 +25,9 @@ if [[ -d $DEP_PATH ]];then
   rm -r -f $DEP_PATH
 fi
 
-cd $BASE_PATH/../../../
+cd $BASE_PATH/../../../ || exit
 
-mvn dependency:copy-dependencies -DincludeScope=runtime -DoutputDirectory=$DEP_PATH
+mvn dependency:copy-dependencies -DincludeScope=runtime -DoutputDirectory=$DEP_PATH -P stage
 
 ls $DEP_PATH | egrep -v "^hugegraph" | sort -n > $BASE_PATH/$FILE_NAME
 rm -r -f $DEP_PATH
diff --git a/computer/pom.xml b/computer/pom.xml
index 10cfdb841..4e8392f0f 100644
--- a/computer/pom.xml
+++ b/computer/pom.xml
@@ -92,7 +92,8 @@
 
     <properties>
         <revision>1.5.0</revision>
-        <hugegraph-commons-version>${revision}</hugegraph-commons-version>
+        <!-- TODO: fix deps conflicts & update to 1.5.0 -->
+        <hugegraph-commons-version>1.3.0</hugegraph-commons-version>
         <hugegraph-toolchain-version>${revision}</hugegraph-toolchain-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <top.level.dir>${project.basedir}/..</top.level.dir>