diff --git a/hugegraph-pd/hg-pd-dist/pom.xml b/hugegraph-pd/hg-pd-dist/pom.xml
index 58cd86250f..3cb51b3938 100644
--- a/hugegraph-pd/hg-pd-dist/pom.xml
+++ b/hugegraph-pd/hg-pd-dist/pom.xml
@@ -36,7 +36,7 @@
${assembly.dir}/descriptor
${assembly.dir}/static
hugegraph-pd-${project.parent.version}
- hugegraph-pd
+ hg-pd-service
diff --git a/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh b/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
index df44dd1078..05b3921c71 100644
--- a/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
+++ b/hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
@@ -114,8 +114,8 @@ fi
echo "Starting HugeGraphPDServer..."
# Turn on security check
-exec ${JAVA} ${JAVA_OPTIONS} -jar -Dspring.config.location=${CONF}/application.yml \
- ${LIB}/hugegraph-pd-*.jar >> ${OUTPUT} 2>&1 &
+exec ${JAVA} -Dname="HugeGraphPD" ${JAVA_OPTIONS} -jar \
+ -Dspring.config.location=${CONF}/application.yml ${LIB}/hg-pd-service-*.jar >> ${OUTPUT} 2>&1 &
PID="$!"
# Write pid to file
diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml
index e7f51323c2..ca2e68d944 100644
--- a/hugegraph-pd/hg-pd-service/pom.xml
+++ b/hugegraph-pd/hg-pd-service/pom.xml
@@ -120,6 +120,12 @@
org.apache.hugegraph
hugegraph-common
1.0.1
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
commons-io
@@ -138,11 +144,14 @@
- spring-boot
org.apache.hugegraph.pd.boot.HugePDServer
+
+
+ repackage
+
diff --git a/hugegraph-pd/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java b/hugegraph-pd/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java
index 0d0cebb3ec..6b1113a2eb 100644
--- a/hugegraph-pd/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java
+++ b/hugegraph-pd/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java
@@ -15,6 +15,8 @@
* under the License.
*/
+package org.apache.hugegraph.pd.rest;
+
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +27,6 @@
import org.apache.hugegraph.pd.grpc.Pdpb;
import org.apache.hugegraph.pd.model.RestApiResponse;
import org.apache.hugegraph.pd.raft.RaftEngine;
-import org.apache.hugegraph.pd.rest.API;
import org.apache.hugegraph.pd.rest.MemberAPI.CallStreamObserverWrap;
import org.apache.hugegraph.pd.service.PDRestService;
import org.apache.hugegraph.pd.service.PDService;
diff --git a/hugegraph-store/hg-store-dist/pom.xml b/hugegraph-store/hg-store-dist/pom.xml
index 5d8030e089..9c548e0611 100644
--- a/hugegraph-store/hg-store-dist/pom.xml
+++ b/hugegraph-store/hg-store-dist/pom.xml
@@ -38,6 +38,7 @@
${assembly.dir}/descriptor
${assembly.dir}/static
hugegraph-store-${revision}
+ hg-store-node
diff --git a/hugegraph-store/hg-store-dist/src/assembly/descriptor/server-assembly.xml b/hugegraph-store/hg-store-dist/src/assembly/descriptor/server-assembly.xml
index 44001cffb9..79dd4cdd0d 100644
--- a/hugegraph-store/hg-store-dist/src/assembly/descriptor/server-assembly.xml
+++ b/hugegraph-store/hg-store-dist/src/assembly/descriptor/server-assembly.xml
@@ -51,9 +51,9 @@
runtime
false
- org.apache.hugegraph:hugegraph-store:jar:*
+ org.apache.hugegraph:${executable.jar.name}:jar:*
-
\ No newline at end of file
+
diff --git a/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh b/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
index 242c417914..4bf1e85347 100644
--- a/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
+++ b/hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
@@ -158,7 +158,7 @@ echo "Starting HG-StoreServer..."
exec ${JAVA} -Dname="HugeGraphStore" ${JVM_OPTIONS} ${JAVA_OPTIONS} -jar \
-Dspring.config.location=${CONF}/application.yml \
- ${LIB}/hugegraph-store-*.jar >> ${OUTPUT} 2>&1 &
+ ${LIB}/hg-store-node-*.jar >> ${OUTPUT} 2>&1 &
PID="$!"
# Write pid to file
diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml
index bed0566ab9..22bffb49c1 100644
--- a/hugegraph-store/hg-store-node/pom.xml
+++ b/hugegraph-store/hg-store-node/pom.xml
@@ -43,11 +43,6 @@
-
- org.springframework.boot
- spring-boot-starter-log4j2
- 2.5.14
-
org.springframework.boot
spring-boot-starter-actuator
@@ -149,7 +144,16 @@
3.6.4
-
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.17.2
+
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.17.2
+
@@ -168,6 +172,7 @@
org.apache.hugegraph.store.node.StoreNodeApplication
+ true