diff --git a/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java b/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java index 2ad2d36ad..7193e223a 100644 --- a/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java +++ b/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java @@ -28,8 +28,6 @@ public class Version { /** * 软件版本号 - * - * @return */ public static String getVersion() { if (version.isEmpty()) { @@ -38,7 +36,7 @@ public class Version { int len = is.read(buf); version = new String(buf, 0, len); } catch (Exception e) { - log.error("Version.getVersion exception {}", e); + log.error("Version.getVersion exception: ", e); } } return version; @@ -46,8 +44,6 @@ public class Version { /** * 存储格式版本号 - * - * @return */ public static int getDataFmtVersion() { return 1; diff --git a/hg-store-dist/pom.xml b/hg-store-dist/pom.xml index 135cff1ee..44c6aabb5 100644 --- a/hg-store-dist/pom.xml +++ b/hg-store-dist/pom.xml @@ -31,12 +31,13 @@ hg-store-dist - ${project.parent.basedir}/dist + + ${project.basedir}/../dist bash ${project.basedir}/src/assembly ${assembly.dir}/descriptor ${assembly.dir}/static - hugegraph-store-${project.parent.version} + hugegraph-store-${revision} @@ -106,10 +107,10 @@ - tar -zcvf \ + tar zcvf \ ${dist.dir}/${final.name}.tar.gz \ ${final.name} || exit 1 - rm -rf ${dist.dir}/${final.name} + rm -f ${dist.dir}/dist.sh echo echo "HugeGraph dist tar.gz available at: @@ -121,6 +122,10 @@ + + + + @@ -128,6 +133,7 @@ + ant-contrib ant-contrib 1.0b3 diff --git a/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh b/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh index 956f901af..6520f5b79 100644 --- a/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh +++ b/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh @@ -152,7 +152,7 @@ fi echo "Starting HugeGraphStoreServer..." exec ${JAVA} ${JVM_OPTIONS} ${JAVA_OPTIONS} -jar -Dspring.config.location=${CONF}/application.yml \ - ${LIB}/hugegraph-store-3.6.3-SNAPSHOT.jar >> ${OUTPUT} 2>&1 & + ${LIB}/hugegraph-store-*.jar >> ${OUTPUT} 2>&1 & PID="$!" # Write pid to file diff --git a/hg-store-dist/src/assembly/static/conf/application.yml b/hg-store-dist/src/assembly/static/conf/application.yml index 913214c2c..de9bd5df4 100644 --- a/hg-store-dist/src/assembly/static/conf/application.yml +++ b/hg-store-dist/src/assembly/static/conf/application.yml @@ -1,5 +1,5 @@ pdserver: - # pd服务地址,多个pd地址用逗号分割 + # pd 服务地址,多个 pd 地址用逗号分割 address: localhost:8686 management: @@ -13,7 +13,7 @@ management: include: "*" grpc: - # grpc的服务地址 + # grpc 的服务地址 host: 127.0.0.1 port: 8500 netty-server: diff --git a/pom.xml b/pom.xml index 2c2713205..fdee09ee1 100644 --- a/pom.xml +++ b/pom.xml @@ -42,8 +42,8 @@ hg-store-node hg-store-dist hg-store-cli - - + + @@ -164,11 +164,12 @@ *.tar *.tar.gz .flattened-pom.xml - + + false - +