From 8c03d72744f7ade392245ae7f8236a6004ff8ea7 Mon Sep 17 00:00:00 2001 From: V_Galaxy <1904821183@qq.com> Date: Tue, 27 Jun 2023 23:44:24 +0800 Subject: [PATCH] chore: add flatten plugin and fix dependency version * build: add flatten plugin and fix dependency version * Update pom.xml --------- Co-authored-by: imbajin --- .gitignore | 1 + hg-store-cli/pom.xml | 1 + hg-store-client/pom.xml | 9 +++++++-- hg-store-common/pom.xml | 1 + hg-store-core/pom.xml | 9 ++------- hg-store-dist/pom.xml | 1 + hg-store-grpc/pom.xml | 9 +++++++-- hg-store-node/pom.xml | 1 + hg-store-rocksdb/pom.xml | 3 ++- hg-store-test/pom.xml | 3 ++- pom.xml | 30 ++++++++++++++++++++++++++++-- 11 files changed, 53 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 556831fcb..901795e22 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ dist/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* /logs/ +.flattened-pom.xml diff --git a/hg-store-cli/pom.xml b/hg-store-cli/pom.xml index ce27b86a4..d28bd89b6 100644 --- a/hg-store-cli/pom.xml +++ b/hg-store-cli/pom.xml @@ -23,6 +23,7 @@ org.apache.hugegraph hugegraph-store-root ${revision} + ../pom.xml 4.0.0 diff --git a/hg-store-client/pom.xml b/hg-store-client/pom.xml index 6cc697dfd..8397deb23 100644 --- a/hg-store-client/pom.xml +++ b/hg-store-client/pom.xml @@ -21,9 +21,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hugegraph + + org.apache.hugegraph + hugegraph-store-root + ${revision} + ../pom.xml + + hg-store-client - ${revision} 11 diff --git a/hg-store-common/pom.xml b/hg-store-common/pom.xml index 7c1ffbe54..3044a202b 100644 --- a/hg-store-common/pom.xml +++ b/hg-store-common/pom.xml @@ -26,6 +26,7 @@ org.apache.hugegraph hugegraph-store-root ${revision} + ../pom.xml hg-store-common diff --git a/hg-store-core/pom.xml b/hg-store-core/pom.xml index 9dd81438b..09c3a9bef 100644 --- a/hg-store-core/pom.xml +++ b/hg-store-core/pom.xml @@ -24,6 +24,7 @@ org.apache.hugegraph hugegraph-store-root ${revision} + ../pom.xml hg-store-core @@ -47,7 +48,7 @@ com.alipay.sofa jraft-core - 1.3.9-hg-SNAPSHOT + 1.3.9 org.rocksdb @@ -127,12 +128,6 @@ hg-store-client test - - - org.apache.scan - safesdk-java - 3.0.2 - \ No newline at end of file diff --git a/hg-store-dist/pom.xml b/hg-store-dist/pom.xml index 0086e6209..135cff1ee 100644 --- a/hg-store-dist/pom.xml +++ b/hg-store-dist/pom.xml @@ -24,6 +24,7 @@ org.apache.hugegraph hugegraph-store-root ${revision} + ../pom.xml 4.0.0 diff --git a/hg-store-grpc/pom.xml b/hg-store-grpc/pom.xml index 0a3090f29..54980831c 100644 --- a/hg-store-grpc/pom.xml +++ b/hg-store-grpc/pom.xml @@ -21,9 +21,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.hugegraph + + org.apache.hugegraph + hugegraph-store-root + ${revision} + ../pom.xml + + hg-store-grpc - ${revision} 11 diff --git a/hg-store-node/pom.xml b/hg-store-node/pom.xml index 94710c75e..b0af90b60 100644 --- a/hg-store-node/pom.xml +++ b/hg-store-node/pom.xml @@ -25,6 +25,7 @@ org.apache.hugegraph hugegraph-store-root ${revision} + ../pom.xml hugegraph-store diff --git a/hg-store-rocksdb/pom.xml b/hg-store-rocksdb/pom.xml index b4dfae9e4..0c105dff4 100644 --- a/hg-store-rocksdb/pom.xml +++ b/hg-store-rocksdb/pom.xml @@ -25,6 +25,7 @@ org.apache.hugegraph hugegraph-store-root ${revision} + ../pom.xml hg-store-rocksdb @@ -33,7 +34,7 @@ org.apache.hugegraph hugegraph-common - 1.0.0 + 1.0.1 org.glassfish.jersey.inject diff --git a/hg-store-test/pom.xml b/hg-store-test/pom.xml index 2fe206423..94d2b4f75 100644 --- a/hg-store-test/pom.xml +++ b/hg-store-test/pom.xml @@ -23,6 +23,7 @@ hugegraph-store-root org.apache.hugegraph ${revision} + ../pom.xml 4.0.0 @@ -192,7 +193,7 @@ com.alipay.sofa jraft-core - 1.3.9-hg-SNAPSHOT + 1.3.9 org.rocksdb diff --git a/pom.xml b/pom.xml index 8f79c9d21..315b30250 100644 --- a/pom.xml +++ b/pom.xml @@ -42,14 +42,15 @@ hg-store-node hg-store-dist hg-store-cli - hg-store-test + + 1.5.0 11 11 - 3.6.4-SNAPSHOT + 1.5.0 2.15.0 @@ -127,6 +128,31 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + +