This is an automated email from the ASF dual-hosted git repository.
jin pushed a commit to branch pd-store
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/pd-store by this push:
new b19aa3045 refact: adjust pom structure for directly compiling from
root (#2275)
b19aa3045 is described below
commit b19aa304540f3351a2d80fd1f061a4c4f5e08036
Author: Yuexuan Zhang <[email protected]>
AuthorDate: Fri Aug 11 18:36:53 2023 +0800
refact: adjust pom structure for directly compiling from root (#2275)
* build: remove unused deps in hugegraph-pd
* chore: add compiled hugegraph-core.jar as dependency
* chore: remove unused dependency.
* fix: change hugegraph-core scope type in hg-store-node
* build: unify revision to 1.5.0.1
* chore: clean swagger files
---------
Co-authored-by: V_Galaxy <[email protected]>
Co-authored-by: imbajin <[email protected]>
---
hugegraph-pd/hg-pd-core/pom.xml | 6 -
hugegraph-pd/hg-pd-dist/pom.xml | 2 +-
hugegraph-pd/hg-pd-test/pom.xml | 12 +-
hugegraph-server/hugegraph-dist/pom.xml | 3 +-
hugegraph-store/hg-store-core/pom.xml | 46 ++-
hugegraph-store/hg-store-dist/pom.xml | 2 +-
.../src/assembly/ext-lib/hugegraph-core-1.5.0.jar | Bin 0 -> 1530741 bytes
.../src/assembly/ext-lib/hugegraph-core-1.5.0.pom | 441 +++++++++++++++++++++
hugegraph-store/hg-store-node/pom.xml | 13 +-
hugegraph-store/hg-store-test/pom.xml | 31 +-
hugegraph-store/pom.xml | 4 +-
pom.xml | 2 +-
12 files changed, 516 insertions(+), 46 deletions(-)
diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml
index 374d9a93c..084e315d3 100644
--- a/hugegraph-pd/hg-pd-core/pom.xml
+++ b/hugegraph-pd/hg-pd-core/pom.xml
@@ -84,11 +84,5 @@
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.hugegraph</groupId>
- <artifactId>hg-store-grpc</artifactId>
- <version>${revision}</version>
- </dependency>
</dependencies>
</project>
diff --git a/hugegraph-pd/hg-pd-dist/pom.xml b/hugegraph-pd/hg-pd-dist/pom.xml
index e2d1da0a7..58cd86250 100644
--- a/hugegraph-pd/hg-pd-dist/pom.xml
+++ b/hugegraph-pd/hg-pd-dist/pom.xml
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hugegraph</groupId>
- <artifactId>hugegraph-pd</artifactId>
+ <artifactId>hg-pd-service</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml
index 7924ca4c0..ecdbea2ef 100644
--- a/hugegraph-pd/hg-pd-test/pom.xml
+++ b/hugegraph-pd/hg-pd-test/pom.xml
@@ -72,16 +72,6 @@
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.hugegraph</groupId>
- <artifactId>hg-store-grpc</artifactId>
- <version>${revision}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hugegraph</groupId>
- <artifactId>hg-store-common</artifactId>
- <version>${revision}</version>
- </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -198,7 +188,7 @@
</dependency>
<dependency>
<groupId>org.apache.hugegraph</groupId>
- <artifactId>hugegraph-pd</artifactId>
+ <artifactId>hg-pd-service</artifactId>
<version>${revision}</version>
</dependency>
<!--dependency>
diff --git a/hugegraph-server/hugegraph-dist/pom.xml
b/hugegraph-server/hugegraph-dist/pom.xml
index d1801898b..e9f8e3c43 100644
--- a/hugegraph-server/hugegraph-dist/pom.xml
+++ b/hugegraph-server/hugegraph-dist/pom.xml
@@ -183,12 +183,13 @@
<echo file="${project.basedir}/dist.sh">
wget --version 1>/dev/null || exit
wget
https://github.com/swagger-api/swagger-ui/archive/refs/tags/v4.15.5.tar.gz
- tar zxvf v4.15.5.tar.gz
+ tar zxf v4.15.5.tar.gz
echo "window.onload = function() {
window.ui = SwaggerUIBundle({
url:'/openapi.json',dom_id:'#swagger-ui',deepLinking:true,layout:'StandaloneLayout',
presets:[SwaggerUIBundle.presets.apis,
SwaggerUIStandalonePreset ],
plugins:[SwaggerUIBundle.plugins.DownloadUrl]});};" >
swagger-ui-4.15.5/dist/swagger-initializer.js
cp -r swagger-ui-4.15.5/dist
../${final.name}/swagger-ui
+ rm -rfv swagger-ui-4.15.5 dist.sh
</echo>
<exec executable="${shell-executable}"
dir="${project.basedir}" failonerror="true">
<arg line="./dist.sh"/>
diff --git a/hugegraph-store/hg-store-core/pom.xml
b/hugegraph-store/hg-store-core/pom.xml
index 2f0ea4efa..e8232672b 100644
--- a/hugegraph-store/hg-store-core/pom.xml
+++ b/hugegraph-store/hg-store-core/pom.xml
@@ -111,9 +111,53 @@
<version>${revision}</version>
</dependency>
<dependency>
+ <!-- TODO: import through system dependency approach is just a
temporal solution -->
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-core</artifactId>
- <version>${hugegraph.server.version}</version>
+ <version>${hugegraph.core.version}</version>
+ <scope>system</scope>
+ <systemPath>
+
${top.level.dir}/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.jar
+ </systemPath>
+ </dependency>
+ <!-- tinkerpop -->
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
+ <version>3.5.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-configuration2</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-text</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ <version>3.5.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jeremyh</groupId>
+ <artifactId>jBCrypt</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/hugegraph-store/hg-store-dist/pom.xml
b/hugegraph-store/hg-store-dist/pom.xml
index 1fe2448e5..5d8030e08 100644
--- a/hugegraph-store/hg-store-dist/pom.xml
+++ b/hugegraph-store/hg-store-dist/pom.xml
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hugegraph</groupId>
- <artifactId>hugegraph-store</artifactId>
+ <artifactId>hg-store-node</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
diff --git
a/hugegraph-store/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.jar
b/hugegraph-store/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.jar
new file mode 100644
index 000000000..72a4b2051
Binary files /dev/null and
b/hugegraph-store/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.jar
differ
diff --git
a/hugegraph-store/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.pom
b/hugegraph-store/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.pom
new file mode 100644
index 000000000..90d828a15
--- /dev/null
+++
b/hugegraph-store/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.pom
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership. The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+ -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hugegraph</artifactId>
+ <version>1.5.0</version>
+ </parent>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hugegraph-core</artifactId>
+ <version>1.5.0</version>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <properties>
+ <top.level.dir>${basedir}/..</top.level.dir>
+ <fabric8.version>5.6.0</fabric8.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hugegraph-common</artifactId>
+ <version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hg-pd-client</artifactId>
+ <version>${pdclient.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>4.1.52.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jeremyh</groupId>
+ <artifactId>jBCrypt</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-driver</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>3.17.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.caffinitas.ohc</groupId>
+ <artifactId>ohc-core</artifactId>
+ <version>0.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apdplat</groupId>
+ <artifactId>word</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ansj</groupId>
+ <artifactId>ansj_seg</artifactId>
+ <version>5.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.hankcs</groupId>
+ <artifactId>hanlp</artifactId>
+ <version>portable-1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-smartcn</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>7.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.huaban</groupId>
+ <artifactId>jieba-analysis</artifactId>
+ <version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.lionsoul</groupId>
+ <artifactId>jcseg-core</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.chenlb.mmseg4j</groupId>
+ <artifactId>mmseg4j-core</artifactId>
+ <version>1.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.janeluo</groupId>
+ <artifactId>ikanalyzer</artifactId>
+ <version>2012_u6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.20</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.collections</groupId>
+ <artifactId>eclipse-collections-api</artifactId>
+ <version>10.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.collections</groupId>
+ <artifactId>eclipse-collections</artifactId>
+ <version>10.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>it.unimi.dsi</groupId>
+ <artifactId>fastutil</artifactId>
+ <version>8.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-api</artifactId>
+ <version>0.11.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-impl</artifactId>
+ <version>0.11.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-jackson</artifactId>
+ <version>0.11.2</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.etcd</groupId>
+ <artifactId>jetcd-core</artifactId>
+ <version>0.5.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.9</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <version>2.0.26.Final</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.1.52.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.1.52.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client</artifactId>
+ <version>${fabric8.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>computer-k8s</artifactId>
+ <version>1.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hugegraph-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hugegraph-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-locator</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-locator</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hg-store-common</artifactId>
+ <version>${hgstore-common.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/jni</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>${basedir}/target</directory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${top.level.dir}</directory>
+ <includes>
+ <include>*.tar.gz</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>${final.name}</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Version>3.6.3.0</Implementation-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/hugegraph-store/hg-store-node/pom.xml
b/hugegraph-store/hg-store-node/pom.xml
index 211bd1bfd..bed0566ab 100644
--- a/hugegraph-store/hg-store-node/pom.xml
+++ b/hugegraph-store/hg-store-node/pom.xml
@@ -127,15 +127,14 @@
<artifactId>hg-store-core</artifactId>
</dependency>
<dependency>
+ <!-- TODO: import through system dependency approach is just a
temporal solution -->
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-core</artifactId>
- <version>${hugegraph.server.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.etcd</groupId>
- <artifactId>jetcd-core</artifactId>
- </exclusion>
- </exclusions>
+ <version>${hugegraph.core.version}</version>
+ <scope>system</scope>
+ <systemPath>
+
${top.level.dir}/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.jar
+ </systemPath>
</dependency>
diff --git a/hugegraph-store/hg-store-test/pom.xml
b/hugegraph-store/hg-store-test/pom.xml
index 94d2b4f75..31ec72076 100644
--- a/hugegraph-store/hg-store-test/pom.xml
+++ b/hugegraph-store/hg-store-test/pom.xml
@@ -20,7 +20,7 @@
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>hugegraph-store-root</artifactId>
+ <artifactId>hugegraph-store</artifactId>
<groupId>org.apache.hugegraph</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
@@ -133,10 +133,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
+ <version>5.3.20</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
+ <version>5.3.20</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -152,6 +154,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <version>2.5.14</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -203,11 +206,20 @@
</dependency>
<dependency>
<groupId>org.apache.hugegraph</groupId>
- <artifactId>hugegraph-store</artifactId>
+ <artifactId>hg-store-node</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
-
+ <!-- TODO: import through system dependency approach is just a
temporal solution -->
+ <dependency>
+ <groupId>org.apache.hugegraph</groupId>
+ <artifactId>hugegraph-core</artifactId>
+ <version>${hugegraph.core.version}</version>
+ <scope>system</scope>
+ <systemPath>
+
${top.level.dir}/hg-store-dist/src/assembly/ext-lib/hugegraph-core-1.5.0.jar
+ </systemPath>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -333,15 +345,4 @@
</resource>
</resources>
</build>
- <distributionManagement>
- <repository>
- <id>Baidu_Local</id>
-
<url>http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local</url>
- </repository>
- <snapshotRepository>
- <id>Baidu_Local_Snapshots</id>
-
<url>http://maven.baidu-int.com/nexus/content/repositories/Baidu_Local_Snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml
index d9e31e720..bb5a23020 100644
--- a/hugegraph-store/pom.xml
+++ b/hugegraph-store/pom.xml
@@ -46,11 +46,11 @@
</modules>
<properties>
- <revision>1.5.0</revision>
+ <hugegraph.core.version>1.5.0</hugegraph.core.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
- <hugegraph.server.version>1.5.0</hugegraph.server.version>
<log4j2.version>2.15.0</log4j2.version>
+ <top.level.dir>${project.basedir}/..</top.level.dir>
</properties>
<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index f2542c127..b2fc6299a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
</prerequisites>
<properties>
- <revision>1.5.0</revision>
+ <revision>1.5.0.1</revision>
</properties>
<modules>
