From a39fcc3e623b551a75dd62cd2f09e2e5debd368d Mon Sep 17 00:00:00 2001 From: vaughn Date: Tue, 16 Jul 2024 12:07:49 +0800 Subject: [PATCH 1/6] upgrade lombok version --- hugegraph-pd/hg-pd-client/pom.xml | 2 +- hugegraph-pd/hg-pd-core/pom.xml | 2 +- hugegraph-pd/hg-pd-service/pom.xml | 2 +- hugegraph-pd/hg-pd-test/pom.xml | 2 +- hugegraph-store/hg-store-client/pom.xml | 2 +- hugegraph-store/hg-store-core/pom.xml | 2 +- hugegraph-store/hg-store-node/pom.xml | 2 +- hugegraph-store/hg-store-rocksdb/pom.xml | 2 +- hugegraph-store/hg-store-test/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml index f3cb23cf83..11fb03b17e 100644 --- a/hugegraph-pd/hg-pd-client/pom.xml +++ b/hugegraph-pd/hg-pd-client/pom.xml @@ -34,7 +34,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.30 org.apache.logging.log4j diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml index 1f23259d21..be56e2f4d5 100644 --- a/hugegraph-pd/hg-pd-core/pom.xml +++ b/hugegraph-pd/hg-pd-core/pom.xml @@ -72,7 +72,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 org.apache.commons diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml index 14fed89ee0..a678df6119 100644 --- a/hugegraph-pd/hg-pd-service/pom.xml +++ b/hugegraph-pd/hg-pd-service/pom.xml @@ -114,7 +114,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml index 440346611c..de1b08affb 100644 --- a/hugegraph-pd/hg-pd-test/pom.xml +++ b/hugegraph-pd/hg-pd-test/pom.xml @@ -75,7 +75,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 org.springframework diff --git a/hugegraph-store/hg-store-client/pom.xml b/hugegraph-store/hg-store-client/pom.xml index afa97fa0c2..f2d0dc29a2 100644 --- a/hugegraph-store/hg-store-client/pom.xml +++ b/hugegraph-store/hg-store-client/pom.xml @@ -32,7 +32,7 @@ true - 1.18.20 + 1.18.30 diff --git a/hugegraph-store/hg-store-core/pom.xml b/hugegraph-store/hg-store-core/pom.xml index 60a0954ac9..8379e43b57 100644 --- a/hugegraph-store/hg-store-core/pom.xml +++ b/hugegraph-store/hg-store-core/pom.xml @@ -34,7 +34,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml index cf0444584e..51ea9d2d7a 100644 --- a/hugegraph-store/hg-store-node/pom.xml +++ b/hugegraph-store/hg-store-node/pom.xml @@ -83,7 +83,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 org.springframework.boot diff --git a/hugegraph-store/hg-store-rocksdb/pom.xml b/hugegraph-store/hg-store-rocksdb/pom.xml index 758a283abb..8953a44433 100644 --- a/hugegraph-store/hg-store-rocksdb/pom.xml +++ b/hugegraph-store/hg-store-rocksdb/pom.xml @@ -62,7 +62,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.30 provided diff --git a/hugegraph-store/hg-store-test/pom.xml b/hugegraph-store/hg-store-test/pom.xml index 59f87eaa6d..7fea90297b 100644 --- a/hugegraph-store/hg-store-test/pom.xml +++ b/hugegraph-store/hg-store-test/pom.xml @@ -31,7 +31,7 @@ - 1.18.20 + 1.18.30 From e1e613e4b3bd78ad43fc0f47ad17b8d6c473334b Mon Sep 17 00:00:00 2001 From: vaughn Date: Sat, 24 Aug 2024 21:37:38 +0800 Subject: [PATCH 2/6] fix: ci --- hugegraph-commons/hugegraph-common/pom.xml | 3 +- .../scripts/dependency/known-dependencies.txt | 42 +++---------------- hugegraph-commons/pom.xml | 10 +++++ hugegraph-pd/hg-pd-client/pom.xml | 2 +- hugegraph-pd/hg-pd-common/pom.xml | 2 +- hugegraph-pd/hg-pd-core/pom.xml | 2 +- hugegraph-pd/hg-pd-service/pom.xml | 2 +- hugegraph-pd/hg-pd-test/pom.xml | 2 +- hugegraph-pd/pom.xml | 5 +++ hugegraph-store/hg-store-client/pom.xml | 1 + hugegraph-store/hg-store-core/pom.xml | 2 +- hugegraph-store/hg-store-node/pom.xml | 2 +- hugegraph-store/hg-store-rocksdb/pom.xml | 3 +- hugegraph-store/hg-store-test/pom.xml | 1 + hugegraph-store/pom.xml | 5 +++ .../scripts/dependency/known-dependencies.txt | 32 +++++++------- 16 files changed, 51 insertions(+), 65 deletions(-) diff --git a/hugegraph-commons/hugegraph-common/pom.xml b/hugegraph-commons/hugegraph-common/pom.xml index 2010869b17..4b3d545b80 100644 --- a/hugegraph-commons/hugegraph-common/pom.xml +++ b/hugegraph-commons/hugegraph-common/pom.xml @@ -38,7 +38,6 @@ - 1.18.8 4.10.0 @@ -224,7 +223,7 @@ org.projectlombok lombok - ${lombok.version} + compile true diff --git a/hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt index 53b4567d5b..9a421edcd4 100644 --- a/hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -1,7 +1,4 @@ -animal-sniffer-annotations-1.18.jar -annotations-4.1.1.4.jar annotations-13.0.jar -bolt-1.6.2.jar checker-qual-3.5.0.jar commons-beanutils-1.9.4.jar commons-codec-1.13.jar @@ -13,25 +10,14 @@ commons-lang-2.6.jar commons-lang3-3.12.0.jar commons-logging-1.1.1.jar commons-text-1.9.jar -disruptor-3.3.7.jar error_prone_annotations-2.3.4.jar failureaccess-1.0.1.jar -grpc-api-1.28.1.jar -grpc-context-1.28.1.jar -grpc-core-1.28.1.jar -grpc-netty-shaded-1.28.0.jar -grpc-protobuf-1.28.0.jar -grpc-protobuf-lite-1.28.0.jar -grpc-stub-1.28.0.jar -gson-2.8.6.jar guava-30.0-jre.jar hamcrest-core-1.3.jar -hessian-3.3.7.jar j2objc-annotations-1.3.jar jackson-annotations-2.14.0-rc1.jar jackson-core-2.14.0-rc1.jar jackson-databind-2.14.0-rc1.jar -jackson-dataformat-yaml-2.9.3.jar jackson-jaxrs-base-2.14.0-rc1.jar jackson-jaxrs-json-provider-2.14.0-rc1.jar jackson-module-jaxb-annotations-2.14.0-rc1.jar @@ -44,34 +30,16 @@ jaxb-impl-3.0.2.jar joda-time-2.10.8.jar jsr305-3.0.1.jar junit-4.13.1.jar -listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -log4j-api-2.18.0.jar -log4j-core-2.18.0.jar -log4j-slf4j-impl-2.18.0.jar -lookout-api-1.4.1.jar -netty-all-4.1.42.Final.jar -opentracing-api-0.22.0.jar -opentracing-mock-0.22.0.jar -opentracing-noop-0.22.0.jar -opentracing-util-0.22.0.jar -perfmark-api-0.19.0.jar -proto-google-common-protos-1.17.0.jar -protobuf-java-3.11.0.jar -slf4j-api-1.7.25.jar -snakeyaml-1.18.jar -sofa-common-tools-1.0.12.jar -sofa-rpc-all-5.7.6.jar -swagger-annotations-1.5.18.jar -swagger-core-1.5.18.jar -swagger-models-1.5.18.jar -tracer-core-3.0.8.jar -validation-api-1.1.0.Final.jar kotlin-stdlib-1.6.20.jar kotlin-stdlib-common-1.5.31.jar kotlin-stdlib-jdk7-1.6.10.jar kotlin-stdlib-jdk8-1.6.10.jar +listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +log4j-api-2.18.0.jar +log4j-core-2.18.0.jar +log4j-slf4j-impl-2.18.0.jar logging-interceptor-4.10.0.jar lombok-1.18.8.jar okhttp-4.10.0.jar okio-jvm-3.0.0.jar - +slf4j-api-1.7.25.jar diff --git a/hugegraph-commons/pom.xml b/hugegraph-commons/pom.xml index 91d0eb42f6..c753076ff1 100644 --- a/hugegraph-commons/pom.xml +++ b/hugegraph-commons/pom.xml @@ -124,6 +124,16 @@ hugegraph-rpc + + + + org.projectlombok + lombok + 1.18.30 + + + + diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml index 11fb03b17e..9cb5114aaa 100644 --- a/hugegraph-pd/hg-pd-client/pom.xml +++ b/hugegraph-pd/hg-pd-client/pom.xml @@ -34,7 +34,7 @@ org.projectlombok lombok - 1.18.30 + compile org.apache.logging.log4j diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml index 4885b1b0bf..ca7a851949 100644 --- a/hugegraph-pd/hg-pd-common/pom.xml +++ b/hugegraph-pd/hg-pd-common/pom.xml @@ -38,7 +38,7 @@ org.projectlombok lombok - 1.18.24 + compile org.apache.commons diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml index be56e2f4d5..acd78a9375 100644 --- a/hugegraph-pd/hg-pd-core/pom.xml +++ b/hugegraph-pd/hg-pd-core/pom.xml @@ -72,7 +72,7 @@ org.projectlombok lombok - 1.18.30 + compile org.apache.commons diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml index a678df6119..38c5fcdba3 100644 --- a/hugegraph-pd/hg-pd-service/pom.xml +++ b/hugegraph-pd/hg-pd-service/pom.xml @@ -114,7 +114,7 @@ org.projectlombok lombok - 1.18.30 + compile diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml index de1b08affb..05bf8c1fee 100644 --- a/hugegraph-pd/hg-pd-test/pom.xml +++ b/hugegraph-pd/hg-pd-test/pom.xml @@ -75,7 +75,7 @@ org.projectlombok lombok - 1.18.30 + compile org.springframework diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index b2547a7dc4..c087922506 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -63,6 +63,11 @@ hg-pd-common ${revision} + + org.projectlombok + lombok + 1.18.30 + diff --git a/hugegraph-store/hg-store-client/pom.xml b/hugegraph-store/hg-store-client/pom.xml index f2d0dc29a2..a64f4fd413 100644 --- a/hugegraph-store/hg-store-client/pom.xml +++ b/hugegraph-store/hg-store-client/pom.xml @@ -61,6 +61,7 @@ org.projectlombok lombok ${lombok.version} + compile org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-core/pom.xml b/hugegraph-store/hg-store-core/pom.xml index 8379e43b57..8fe4f1d076 100644 --- a/hugegraph-store/hg-store-core/pom.xml +++ b/hugegraph-store/hg-store-core/pom.xml @@ -34,7 +34,7 @@ org.projectlombok lombok - 1.18.30 + compile org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml index 51ea9d2d7a..9dd2911655 100644 --- a/hugegraph-store/hg-store-node/pom.xml +++ b/hugegraph-store/hg-store-node/pom.xml @@ -83,7 +83,7 @@ org.projectlombok lombok - 1.18.30 + compile org.springframework.boot diff --git a/hugegraph-store/hg-store-rocksdb/pom.xml b/hugegraph-store/hg-store-rocksdb/pom.xml index 8953a44433..889a84a4c2 100644 --- a/hugegraph-store/hg-store-rocksdb/pom.xml +++ b/hugegraph-store/hg-store-rocksdb/pom.xml @@ -62,8 +62,7 @@ org.projectlombok lombok - 1.18.30 - provided + compile org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-test/pom.xml b/hugegraph-store/hg-store-test/pom.xml index 7fea90297b..3e49fd27f9 100644 --- a/hugegraph-store/hg-store-test/pom.xml +++ b/hugegraph-store/hg-store-test/pom.xml @@ -81,6 +81,7 @@ org.projectlombok lombok ${lombok.version} + compile org.apache.logging.log4j diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml index f9cd0bcfb3..b86829e038 100644 --- a/hugegraph-store/pom.xml +++ b/hugegraph-store/pom.xml @@ -85,6 +85,11 @@ log4j-slf4j-impl ${log4j2.version} + + org.projectlombok + lombok + 1.18.30 + diff --git a/install-dist/scripts/dependency/known-dependencies.txt b/install-dist/scripts/dependency/known-dependencies.txt index 9caa8ecab8..d372461597 100644 --- a/install-dist/scripts/dependency/known-dependencies.txt +++ b/install-dist/scripts/dependency/known-dependencies.txt @@ -1,3 +1,7 @@ +HdrHistogram-2.1.12.jar +HdrHistogram-2.1.9.jar +LatencyUtils-2.0.3.jar +ST4-4.0.8.jar accessors-smart-1.2.jar airline-0.8.jar android-json-0.0.20131108.vaadin1.jar @@ -140,8 +144,6 @@ hamcrest-2.2.jar hamcrest-core-1.3.jar hanlp-portable-1.8.3.jar hbase-shaded-endpoint-2.0.6.jar -HdrHistogram-2.1.12.jar -HdrHistogram-2.1.9.jar hessian-3.3.6.jar hessian-3.3.7.jar hg-pd-client-1.5.0.jar @@ -212,12 +214,12 @@ javassist-3.21.0-GA.jar javassist-3.24.0-GA.jar javassist-3.28.0-GA.jar javatuples-1.2.jar +javax-websocket-client-impl-9.4.46.v20220331.jar +javax-websocket-server-impl-9.4.46.v20220331.jar javax.activation-api-1.2.0.jar javax.annotation-api-1.3.2.jar javax.inject-1.jar javax.json-1.0.jar -javax-websocket-client-impl-9.4.46.v20220331.jar -javax-websocket-server-impl-9.4.46.v20220331.jar jaxb-api-2.3.1.jar jaxb-core-3.0.2.jar jaxb-impl-3.0.2.jar @@ -260,8 +262,8 @@ jetty-util-9.4.46.v20220331.jar jetty-util-ajax-9.4.46.v20220331.jar jetty-webapp-9.4.46.v20220331.jar jetty-xml-9.4.46.v20220331.jar -jffi-1.2.16.jar jffi-1.2.16-native.jar +jffi-1.2.16.jar jflex-1.8.2.jar jieba-analysis-1.0.2.jar jjwt-api-0.11.5.jar @@ -278,10 +280,10 @@ jraft-core-1.3.11.jar jraft-core-1.3.13.jar jraft-core-1.3.9.jar json-20210307.jar -jsonassert-1.5.0.jar json-path-2.5.0.jar json-simple-1.1.jar json-smart-2.3.jar +jsonassert-1.5.0.jar jsr305-3.0.1.jar jsr305-3.0.2.jar jul-to-slf4j-1.7.36.jar @@ -312,7 +314,6 @@ kotlin-stdlib-1.6.20.jar kotlin-stdlib-common-1.5.31.jar kotlin-stdlib-jdk7-1.6.10.jar kotlin-stdlib-jdk8-1.6.10.jar -LatencyUtils-2.0.3.jar listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j-api-2.15.0.jar log4j-api-2.17.0.jar @@ -330,9 +331,7 @@ log4j-slf4j-impl-2.17.0.jar log4j-slf4j-impl-2.17.1.jar log4j-slf4j-impl-2.18.0.jar logging-interceptor-4.10.0.jar -lombok-1.18.20.jar -lombok-1.18.24.jar -lombok-1.18.8.jar +lombok-1.18.30.jar lookout-api-1.4.1.jar lucene-analyzers-common-8.11.2.jar lucene-analyzers-smartcn-8.11.2.jar @@ -363,10 +362,10 @@ netty-buffer-4.1.52.Final.jar netty-buffer-4.1.72.Final.jar netty-codec-4.1.52.Final.jar netty-codec-4.1.72.Final.jar -netty-codec-http2-4.1.52.Final.jar -netty-codec-http2-4.1.72.Final.jar netty-codec-http-4.1.52.Final.jar netty-codec-http-4.1.72.Final.jar +netty-codec-http2-4.1.52.Final.jar +netty-codec-http2-4.1.72.Final.jar netty-codec-socks-4.1.52.Final.jar netty-codec-socks-4.1.72.Final.jar netty-common-4.1.52.Final.jar @@ -414,20 +413,20 @@ powermock-module-junit4-2.0.0-RC.3.jar powermock-module-junit4-common-2.0.0-RC.3.jar powermock-module-junit4-rule-2.0.0-RC.3.jar powermock-reflect-2.0.0-RC.3.jar +proto-google-common-protos-1.17.0.jar +proto-google-common-protos-2.0.1.jar protobuf-java-3.11.0.jar protobuf-java-3.17.2.jar protobuf-java-3.21.7.jar protobuf-java-3.5.1.jar protobuf-java-util-3.17.2.jar -proto-google-common-protos-1.17.0.jar -proto-google-common-protos-2.0.1.jar protostuff-api-1.6.0.jar protostuff-collectionschema-1.6.0.jar protostuff-core-1.6.0.jar protostuff-runtime-1.6.0.jar psjava-0.1.19.jar -reporter-config3-3.0.3.jar reporter-config-base-3.0.3.jar +reporter-config3-3.0.3.jar rewriting-9.0-9.0.20190305.jar rocksdbjni-6.29.5.jar rocksdbjni-7.2.2.jar @@ -444,9 +443,9 @@ sjk-cli-0.22.jar sjk-core-0.14.jar sjk-core-0.22.jar sjk-hflame-0.22.jar +sjk-jfr-standalone-0.7.jar sjk-jfr5-0.5.jar sjk-jfr6-0.7.jar -sjk-jfr-standalone-0.7.jar sjk-json-0.14.jar sjk-json-0.22.jar sjk-nps-0.9.jar @@ -489,7 +488,6 @@ spring-expression-5.3.20.jar spring-jcl-5.3.20.jar spring-web-5.3.20.jar spring-webmvc-5.3.20.jar -ST4-4.0.8.jar stream-2.5.2.jar swagger-annotations-1.5.18.jar swagger-annotations-jakarta-2.2.18.jar From 91b404c35229ef072d762047db26725d7c879a8b Mon Sep 17 00:00:00 2001 From: vaughn Date: Sun, 25 Aug 2024 16:02:06 +0800 Subject: [PATCH 3/6] improve --- hugegraph-pd/hg-pd-client/pom.xml | 1 + hugegraph-pd/hg-pd-common/pom.xml | 1 + hugegraph-pd/hg-pd-core/pom.xml | 1 + hugegraph-pd/hg-pd-service/pom.xml | 1 + hugegraph-pd/hg-pd-test/pom.xml | 1 + hugegraph-store/hg-store-cli/pom.xml | 6 ++++++ hugegraph-store/hg-store-client/pom.xml | 1 + hugegraph-store/hg-store-core/pom.xml | 1 + hugegraph-store/hg-store-node/pom.xml | 1 + hugegraph-store/hg-store-rocksdb/pom.xml | 1 + hugegraph-store/hg-store-test/pom.xml | 3 +-- hugegraph-store/pom.xml | 5 ----- pom.xml | 10 ++++++++++ 13 files changed, 26 insertions(+), 7 deletions(-) diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml index 9cb5114aaa..a2a7fb335f 100644 --- a/hugegraph-pd/hg-pd-client/pom.xml +++ b/hugegraph-pd/hg-pd-client/pom.xml @@ -35,6 +35,7 @@ org.projectlombok lombok compile + true org.apache.logging.log4j diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml index ca7a851949..d098c6f7f6 100644 --- a/hugegraph-pd/hg-pd-common/pom.xml +++ b/hugegraph-pd/hg-pd-common/pom.xml @@ -39,6 +39,7 @@ org.projectlombok lombok compile + true org.apache.commons diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml index acd78a9375..4d925b4944 100644 --- a/hugegraph-pd/hg-pd-core/pom.xml +++ b/hugegraph-pd/hg-pd-core/pom.xml @@ -73,6 +73,7 @@ org.projectlombok lombok compile + true org.apache.commons diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml index 38c5fcdba3..3839cfcf3f 100644 --- a/hugegraph-pd/hg-pd-service/pom.xml +++ b/hugegraph-pd/hg-pd-service/pom.xml @@ -115,6 +115,7 @@ org.projectlombok lombok compile + true diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml index 05bf8c1fee..aa17cf8866 100644 --- a/hugegraph-pd/hg-pd-test/pom.xml +++ b/hugegraph-pd/hg-pd-test/pom.xml @@ -76,6 +76,7 @@ org.projectlombok lombok compile + true org.springframework diff --git a/hugegraph-store/hg-store-cli/pom.xml b/hugegraph-store/hg-store-cli/pom.xml index 8757a09c8f..4833cfa2c5 100644 --- a/hugegraph-store/hg-store-cli/pom.xml +++ b/hugegraph-store/hg-store-cli/pom.xml @@ -56,6 +56,12 @@ hg-pd-client ${revision} + + org.projectlombok + lombok + compile + true + diff --git a/hugegraph-store/hg-store-client/pom.xml b/hugegraph-store/hg-store-client/pom.xml index a64f4fd413..fd2ac942ad 100644 --- a/hugegraph-store/hg-store-client/pom.xml +++ b/hugegraph-store/hg-store-client/pom.xml @@ -62,6 +62,7 @@ lombok ${lombok.version} compile + true org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-core/pom.xml b/hugegraph-store/hg-store-core/pom.xml index 8fe4f1d076..08f6f90f3a 100644 --- a/hugegraph-store/hg-store-core/pom.xml +++ b/hugegraph-store/hg-store-core/pom.xml @@ -35,6 +35,7 @@ org.projectlombok lombok compile + true org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml index 9dd2911655..bc844edb8e 100644 --- a/hugegraph-store/hg-store-node/pom.xml +++ b/hugegraph-store/hg-store-node/pom.xml @@ -84,6 +84,7 @@ org.projectlombok lombok compile + true org.springframework.boot diff --git a/hugegraph-store/hg-store-rocksdb/pom.xml b/hugegraph-store/hg-store-rocksdb/pom.xml index 889a84a4c2..5a6c518835 100644 --- a/hugegraph-store/hg-store-rocksdb/pom.xml +++ b/hugegraph-store/hg-store-rocksdb/pom.xml @@ -63,6 +63,7 @@ org.projectlombok lombok compile + true org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-test/pom.xml b/hugegraph-store/hg-store-test/pom.xml index 3e49fd27f9..d400bab41e 100644 --- a/hugegraph-store/hg-store-test/pom.xml +++ b/hugegraph-store/hg-store-test/pom.xml @@ -31,7 +31,6 @@ - 1.18.30 @@ -80,8 +79,8 @@ org.projectlombok lombok - ${lombok.version} compile + true org.apache.logging.log4j diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml index b86829e038..f9cd0bcfb3 100644 --- a/hugegraph-store/pom.xml +++ b/hugegraph-store/pom.xml @@ -85,11 +85,6 @@ log4j-slf4j-impl ${log4j2.version} - - org.projectlombok - lombok - 1.18.30 - diff --git a/pom.xml b/pom.xml index d73753cff4..c66b99212b 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,16 @@ install-dist + + + + org.projectlombok + lombok + 1.18.30 + + + + From 51df676506f8f9111be04b2f0779d23c3cd0bf7e Mon Sep 17 00:00:00 2001 From: vaughn Date: Fri, 27 Sep 2024 16:02:51 +0800 Subject: [PATCH 4/6] fix: expection due to string type become list --- .../java/org/apache/hugegraph/core/GraphManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java index 5cba0a0f0f..9a9d957e8b 100644 --- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java +++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java @@ -401,17 +401,17 @@ private void loadGraph(String name, String graphConfPath) { } private void transferRoleWorkerConfig(HugeConfig config) { - config.addProperty(RoleElectionOptions.NODE_EXTERNAL_URL.name(), + config.setProperty(RoleElectionOptions.NODE_EXTERNAL_URL.name(), this.conf.get(ServerOptions.REST_SERVER_URL)); - config.addProperty(RoleElectionOptions.BASE_TIMEOUT_MILLISECOND.name(), + config.setProperty(RoleElectionOptions.BASE_TIMEOUT_MILLISECOND.name(), this.conf.get(RoleElectionOptions.BASE_TIMEOUT_MILLISECOND)); - config.addProperty(RoleElectionOptions.EXCEEDS_FAIL_COUNT.name(), + config.setProperty(RoleElectionOptions.EXCEEDS_FAIL_COUNT.name(), this.conf.get(RoleElectionOptions.EXCEEDS_FAIL_COUNT)); - config.addProperty(RoleElectionOptions.RANDOM_TIMEOUT_MILLISECOND.name(), + config.setProperty(RoleElectionOptions.RANDOM_TIMEOUT_MILLISECOND.name(), this.conf.get(RoleElectionOptions.RANDOM_TIMEOUT_MILLISECOND)); - config.addProperty(RoleElectionOptions.HEARTBEAT_INTERVAL_SECOND.name(), + config.setProperty(RoleElectionOptions.HEARTBEAT_INTERVAL_SECOND.name(), this.conf.get(RoleElectionOptions.HEARTBEAT_INTERVAL_SECOND)); - config.addProperty(RoleElectionOptions.MASTER_DEAD_TIMES.name(), + config.setProperty(RoleElectionOptions.MASTER_DEAD_TIMES.name(), this.conf.get(RoleElectionOptions.MASTER_DEAD_TIMES)); } From 8010d1bd849cd0a33f8a6a3c88ebd050749d6ba6 Mon Sep 17 00:00:00 2001 From: imbajin Date: Sat, 28 Sep 2024 00:21:11 +0800 Subject: [PATCH 5/6] refact: unify the definition in root pom & remove it in submodules --- hugegraph-commons/hugegraph-common/pom.xml | 3 --- hugegraph-commons/pom.xml | 10 +--------- hugegraph-pd/hg-pd-client/pom.xml | 2 -- hugegraph-pd/hg-pd-common/pom.xml | 2 -- hugegraph-pd/hg-pd-core/pom.xml | 2 -- hugegraph-pd/hg-pd-service/pom.xml | 2 -- hugegraph-pd/hg-pd-test/pom.xml | 2 -- hugegraph-pd/pom.xml | 5 ----- hugegraph-store/hg-store-cli/pom.xml | 2 -- hugegraph-store/hg-store-client/pom.xml | 4 ---- hugegraph-store/hg-store-core/pom.xml | 3 --- hugegraph-store/hg-store-node/pom.xml | 2 -- hugegraph-store/hg-store-rocksdb/pom.xml | 2 -- hugegraph-store/hg-store-test/pom.xml | 2 -- pom.xml | 7 +++++-- 15 files changed, 6 insertions(+), 44 deletions(-) diff --git a/hugegraph-commons/hugegraph-common/pom.xml b/hugegraph-commons/hugegraph-common/pom.xml index 4b3d545b80..4c84b30c99 100644 --- a/hugegraph-commons/hugegraph-common/pom.xml +++ b/hugegraph-commons/hugegraph-common/pom.xml @@ -219,12 +219,9 @@ com.squareup.okhttp3 logging-interceptor - org.projectlombok lombok - compile - true diff --git a/hugegraph-commons/pom.xml b/hugegraph-commons/pom.xml index 9dfb1695c1..09cd71e5a7 100644 --- a/hugegraph-commons/pom.xml +++ b/hugegraph-commons/pom.xml @@ -124,15 +124,7 @@ hugegraph-rpc - - - - org.projectlombok - lombok - 1.18.30 - - - + diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml index a2a7fb335f..2eaab8ac0a 100644 --- a/hugegraph-pd/hg-pd-client/pom.xml +++ b/hugegraph-pd/hg-pd-client/pom.xml @@ -34,8 +34,6 @@ org.projectlombok lombok - compile - true org.apache.logging.log4j diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml index d098c6f7f6..79cfbe4112 100644 --- a/hugegraph-pd/hg-pd-common/pom.xml +++ b/hugegraph-pd/hg-pd-common/pom.xml @@ -38,8 +38,6 @@ org.projectlombok lombok - compile - true org.apache.commons diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml index 4d925b4944..e17570d592 100644 --- a/hugegraph-pd/hg-pd-core/pom.xml +++ b/hugegraph-pd/hg-pd-core/pom.xml @@ -72,8 +72,6 @@ org.projectlombok lombok - compile - true org.apache.commons diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml index 3839cfcf3f..37c90fe869 100644 --- a/hugegraph-pd/hg-pd-service/pom.xml +++ b/hugegraph-pd/hg-pd-service/pom.xml @@ -114,8 +114,6 @@ org.projectlombok lombok - compile - true diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml index aa17cf8866..a2a7c67873 100644 --- a/hugegraph-pd/hg-pd-test/pom.xml +++ b/hugegraph-pd/hg-pd-test/pom.xml @@ -75,8 +75,6 @@ org.projectlombok lombok - compile - true org.springframework diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index c087922506..b2547a7dc4 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -63,11 +63,6 @@ hg-pd-common ${revision} - - org.projectlombok - lombok - 1.18.30 - diff --git a/hugegraph-store/hg-store-cli/pom.xml b/hugegraph-store/hg-store-cli/pom.xml index 4833cfa2c5..84de815696 100644 --- a/hugegraph-store/hg-store-cli/pom.xml +++ b/hugegraph-store/hg-store-cli/pom.xml @@ -59,8 +59,6 @@ org.projectlombok lombok - compile - true diff --git a/hugegraph-store/hg-store-client/pom.xml b/hugegraph-store/hg-store-client/pom.xml index fd2ac942ad..736bc36790 100644 --- a/hugegraph-store/hg-store-client/pom.xml +++ b/hugegraph-store/hg-store-client/pom.xml @@ -32,7 +32,6 @@ true - 1.18.30 @@ -60,9 +59,6 @@ org.projectlombok lombok - ${lombok.version} - compile - true org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-core/pom.xml b/hugegraph-store/hg-store-core/pom.xml index 08f6f90f3a..e59298efa8 100644 --- a/hugegraph-store/hg-store-core/pom.xml +++ b/hugegraph-store/hg-store-core/pom.xml @@ -34,8 +34,6 @@ org.projectlombok lombok - compile - true org.apache.logging.log4j @@ -56,7 +54,6 @@ org.rocksdb rocksdbjni - diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml index bc844edb8e..5406b1c8a4 100644 --- a/hugegraph-store/hg-store-node/pom.xml +++ b/hugegraph-store/hg-store-node/pom.xml @@ -83,8 +83,6 @@ org.projectlombok lombok - compile - true org.springframework.boot diff --git a/hugegraph-store/hg-store-rocksdb/pom.xml b/hugegraph-store/hg-store-rocksdb/pom.xml index 5a6c518835..bb463d7ed9 100644 --- a/hugegraph-store/hg-store-rocksdb/pom.xml +++ b/hugegraph-store/hg-store-rocksdb/pom.xml @@ -62,8 +62,6 @@ org.projectlombok lombok - compile - true org.apache.logging.log4j diff --git a/hugegraph-store/hg-store-test/pom.xml b/hugegraph-store/hg-store-test/pom.xml index d400bab41e..36308f449d 100644 --- a/hugegraph-store/hg-store-test/pom.xml +++ b/hugegraph-store/hg-store-test/pom.xml @@ -79,8 +79,6 @@ org.projectlombok lombok - compile - true org.apache.logging.log4j diff --git a/pom.xml b/pom.xml index c66b99212b..c988277450 100644 --- a/pom.xml +++ b/pom.xml @@ -88,10 +88,11 @@ 1.5.0 1.5.0 + 1.18.30 hugegraph - UTF-8 11 11 + UTF-8 bash @@ -108,7 +109,9 @@ org.projectlombok lombok - 1.18.30 + ${lombok.version} + provided + true From da4a11ce958c07e38ff57eb4b58d355afa759fa3 Mon Sep 17 00:00:00 2001 From: imbajin Date: Sat, 28 Sep 2024 21:43:01 +0800 Subject: [PATCH 6/6] Update known-dependencies.txt --- install-dist/scripts/dependency/known-dependencies.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/install-dist/scripts/dependency/known-dependencies.txt b/install-dist/scripts/dependency/known-dependencies.txt index d372461597..5b8ab3f5ac 100644 --- a/install-dist/scripts/dependency/known-dependencies.txt +++ b/install-dist/scripts/dependency/known-dependencies.txt @@ -331,7 +331,6 @@ log4j-slf4j-impl-2.17.0.jar log4j-slf4j-impl-2.17.1.jar log4j-slf4j-impl-2.18.0.jar logging-interceptor-4.10.0.jar -lombok-1.18.30.jar lookout-api-1.4.1.jar lucene-analyzers-common-8.11.2.jar lucene-analyzers-smartcn-8.11.2.jar