anph
/
hugegraph-sync
forked from hugegraph/hugegraph-sync
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update pom config & start script

This commit is contained in:
imbajin 2023-07-11 19:53:41 +08:00 committed by V_Galaxy
parent cffa495446
commit 7b56c40650
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java
View File

@ -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;

14
hg-store-dist/pom.xml
View File

@ -31,12 +31,13 @@
<artifactId>hg-store-dist</artifactId>
<properties>
<dist.dir>${project.parent.basedir}/dist</dist.dir>
<!-- TODO: enhance the parent attribute -->
<dist.dir>${project.basedir}/../dist</dist.dir>
<shell-executable>bash</shell-executable>
<assembly.dir>${project.basedir}/src/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
<final.name>hugegraph-store-${project.parent.version}</final.name>
<final.name>hugegraph-store-${revision}</final.name>
</properties>
<dependencies>
<dependency>
@ -106,10 +107,10 @@
<contains string="${os.name}" substring="Linux"/>
<then>
<echo file="${dist.dir}/dist.sh">
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 @@
<arg line="./dist.sh"/>
</exec>
</then>
<else>
<!-- WARN: keep msg in one line -->
<echo message="We only tar package in Linux env, you could check pom.xml in pd-dist to modify it"/>
</else>
</if>
</tasks>
</configuration>
@ -128,6 +133,7 @@
</executions>
<dependencies>
<dependency>
<!-- TODO: why we need this? -->
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>

2
hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
View File

@ -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

4
hg-store-dist/src/assembly/static/conf/application.yml
View File

@ -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:

9
pom.xml
View File

@ -42,8 +42,8 @@
<module>hg-store-node</module>
<module>hg-store-dist</module>
<module>hg-store-cli</module>
<!-- TODO: exclude it for build first -->
<!-- <module>hg-store-test</module>-->
<!-- TODO: exclude it for build first -->
<!-- <module>hg-store-test</module>-->
</modules>
<properties>
@ -164,11 +164,12 @@
<include>*.tar</include>
<include>*.tar.gz</include>
<include>.flattened-pom.xml</include>
<!-- <include>${final.name}/**</include>-->
<!-- WARN: delete dist dir may influence dev? -->
<!-- <include>dist</include>-->
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<!-- <fileset><directory>${final.name}</directory></fileset>-->
<!-- <fileset><directory>${final.name}</directory></fileset>-->
</filesets>
</configuration>
</plugin>