From d7d548a52ca4ca9d49bd371280185f56eaf0206a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Mon, 17 Oct 2022 14:44:33 +0800 Subject: [PATCH 01/10] add log4j runtime jar for logging --- analytical_engine/java/grape-runtime/pom.xml | 8 ++++++++ analytical_engine/java/graphx-on-graphscope/pom.xml | 1 + 2 files changed, 9 insertions(+) diff --git a/analytical_engine/java/grape-runtime/pom.xml b/analytical_engine/java/grape-runtime/pom.xml index e6c833fa20cd..7f86b29ec4b8 100644 --- a/analytical_engine/java/grape-runtime/pom.xml +++ b/analytical_engine/java/grape-runtime/pom.xml @@ -60,6 +60,14 @@ org.slf4j slf4j-api + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + diff --git a/analytical_engine/java/graphx-on-graphscope/pom.xml b/analytical_engine/java/graphx-on-graphscope/pom.xml index 4e5fcd759df1..7c32a9d93ee7 100644 --- a/analytical_engine/java/graphx-on-graphscope/pom.xml +++ b/analytical_engine/java/graphx-on-graphscope/pom.xml @@ -24,6 +24,7 @@ graphx-on-graphscope jar + Graphx on GraphScope 8 From a825523cc455929930cb4c97fd1eb3a496dbdc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Mon, 17 Oct 2022 15:22:09 +0800 Subject: [PATCH 02/10] refactor cmake build and add message strategy in java app driver --- analytical_engine/CMakeLists.txt | 41 +++++++++---------- .../java_pie/java_pie_projected_default_app.h | 7 ++-- .../java_pie_projected_parallel_app.h | 11 +++-- .../java_pie/java_pie_property_default_app.h | 12 +++--- .../java_pie/java_pie_property_parallel_app.h | 12 +++--- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/analytical_engine/CMakeLists.txt b/analytical_engine/CMakeLists.txt index 36d209172f8a..05d03c68d3e1 100644 --- a/analytical_engine/CMakeLists.txt +++ b/analytical_engine/CMakeLists.txt @@ -233,24 +233,29 @@ target_link_libraries(gs_proto add_library(gs_util SHARED "core/flags.cc" "core/launcher.cc") target_link_libraries(gs_util PRIVATE - ${LIBGRAPELITE_LIBRARIES} - ${GFLAGS_LIBRARIES} - ${VINEYARD_LIBRARIES} - ${Boost_LIBRARIES} + ${LIBGRAPELITE_LIBRARIES} + ${GFLAGS_LIBRARIES} + ${VINEYARD_LIBRARIES} + ${Boost_LIBRARIES} +) + +if (ENABLE_JAVA_SDK) + target_sources(gs_util PRIVATE "core/java/javasdk.cc") + target_compile_definitions(gs_util PUBLIC ENABLE_JAVA_SDK) + target_link_libraries(gs_util PRIVATE + ${JAVA_JVM_LIBRARY} + ${JNI_LIBRARIES} ) +endif() add_executable(grape_engine "core/grape_engine.cc" "core/grape_instance.cc" - "core/java/javasdk.cc" "core/object/dynamic.cc" ${CORE_RPC_SRC_FILES} ) target_include_directories(grape_engine PRIVATE proto utils) - -if (ENABLE_JAVA_SDK) - target_compile_definitions(grape_engine PUBLIC ENABLE_JAVA_SDK) - target_link_libraries(grape_engine PRIVATE +target_link_libraries(grape_engine PRIVATE gs_proto gs_util ${LIBGRAPELITE_LIBRARIES} @@ -258,20 +263,12 @@ if (ENABLE_JAVA_SDK) ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${VINEYARD_LIBRARIES} - ${JAVA_JVM_LIBRARY} - ${JNI_LIBRARIES} - ) -else() - target_link_libraries(grape_engine PRIVATE - gs_proto - gs_util - ${LIBGRAPELITE_LIBRARIES} - ${GFLAGS_LIBRARIES} - ${CMAKE_DL_LIBS} - ${Boost_LIBRARIES} - ${VINEYARD_LIBRARIES} - ) + ) + +if (ENABLE_JAVA_SDK) + target_compile_definitions(grape_engine PUBLIC ENABLE_JAVA_SDK) endif() + if (LET_IT_CRASH_ON_EXCEPTION) target_compile_definitions(grape_engine PRIVATE LET_IT_CRASH_ON_EXCEPTION) endif () diff --git a/analytical_engine/apps/java_pie/java_pie_projected_default_app.h b/analytical_engine/apps/java_pie/java_pie_projected_default_app.h index 1c286e9dc582..caab36f50543 100644 --- a/analytical_engine/apps/java_pie/java_pie_projected_default_app.h +++ b/analytical_engine/apps/java_pie/java_pie_projected_default_app.h @@ -36,18 +36,19 @@ namespace gs { * * @tparam FRAG_T Should be gs::ArrowProjectedFragment<...> */ -template +template class JavaPIEProjectedDefaultApp : public AppBase>, public grape::Communicator { public: // specialize the templated worker. - INSTALL_DEFAULT_WORKER(JavaPIEProjectedDefaultApp, + INSTALL_DEFAULT_WORKER(JavaPIEProjectedDefaultApp, JavaPIEProjectedDefaultContext, FRAG_T) static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; static constexpr grape::MessageStrategy message_strategy = - grape::MessageStrategy::kAlongOutgoingEdgeToOuterVertex; + _message_strategy; static constexpr bool need_split_edges = true; public: diff --git a/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h b/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h index bf30f62ede1f..f9a0d5bd9b6b 100644 --- a/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h +++ b/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h @@ -26,6 +26,7 @@ limitations under the License. #include "core/context/java_pie_projected_context.h" #include "core/error.h" +#include "core/java/utils.h" namespace gs { @@ -35,19 +36,21 @@ namespace gs { * * @tparam FRAG_T Should be gs::ArrowProjectedFragment<...> */ -template +template class JavaPIEProjectedParallelApp : public grape::ParallelAppBase>, public grape::Communicator { public: // specialize the templated worker. - INSTALL_PARALLEL_WORKER(JavaPIEProjectedParallelApp, - JavaPIEProjectedParallelContext, FRAG_T) + INSTALL_PARALLEL_WORKER(JavaPIEProjectedParallelApp, + JavaPIEProjectedParallelContext, FRAG_T) static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; static constexpr grape::MessageStrategy message_strategy = - grape::MessageStrategy::kAlongOutgoingEdgeToOuterVertex; + _message_strategy; static constexpr bool need_split_edges = true; public: diff --git a/analytical_engine/apps/java_pie/java_pie_property_default_app.h b/analytical_engine/apps/java_pie/java_pie_property_default_app.h index 62bbdcc7b5b6..2eca464da984 100644 --- a/analytical_engine/apps/java_pie/java_pie_property_default_app.h +++ b/analytical_engine/apps/java_pie/java_pie_property_default_app.h @@ -36,18 +36,20 @@ namespace gs { * * @tparam FRAG_T Should be vineyard::ArrowFragment<...> */ -template +template class JavaPIEPropertyDefaultApp : public PropertyAppBase>, public grape::Communicator { public: // specialize the templated worker. - INSTALL_DEFAULT_PROPERTY_WORKER(JavaPIEPropertyDefaultApp, - JavaPIEPropertyDefaultContext, FRAG_T) + INSTALL_DEFAULT_PROPERTY_WORKER( + JavaPIEPropertyDefaultApp, + JavaPIEPropertyDefaultContext, FRAG_T) static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; - static constexpr grape::MessageStrategy message_strategy = - grape::MessageStrategy::kAlongOutgoingEdgeToOuterVertex; + static constexpr grape::MessageStrategy message_strategy = _message_strategy; static constexpr bool need_split_edges = true; public: diff --git a/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h b/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h index 0455de169926..20f61ead4a11 100644 --- a/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h +++ b/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h @@ -36,20 +36,20 @@ namespace gs { * * @tparam FRAG_T Should be vineyard::ArrowFragment<...> */ -template +template class JavaPIEPropertyParallelApp : public ParallelPropertyAppBase>, public grape::Communicator { public: // specialize the templated worker. - INSTALL_PARALLEL_PROPERTY_WORKER(JavaPIEPropertyParallelApp, - JavaPIEPropertyParallelContext, - FRAG_T) + INSTALL_PROPERTY_WORKER(JavaPIEPropertyParallelApp, + JavaPIEPropertyParallelContext, FRAG_T) static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; - static constexpr grape::MessageStrategy message_strategy = - grape::MessageStrategy::kAlongOutgoingEdgeToOuterVertex; + static constexpr grape::MessageStrategy message_strategy = _message_strategy; static constexpr bool need_split_edges = true; public: From ff6a3a058c81caea7177908c35d0fa8243c200b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Mon, 17 Oct 2022 15:42:58 +0800 Subject: [PATCH 03/10] debug --- .../java_pie/java_pie_projected_default_app.h | 10 +++++----- .../java_pie_projected_parallel_app.h | 5 ++--- .../java_pie/java_pie_property_default_app.h | 6 +++--- .../java_pie/java_pie_property_parallel_app.h | 7 +++++-- analytical_engine/core/java/utils.h | 20 +++++++++++++++++++ 5 files changed, 35 insertions(+), 13 deletions(-) diff --git a/analytical_engine/apps/java_pie/java_pie_projected_default_app.h b/analytical_engine/apps/java_pie/java_pie_projected_default_app.h index caab36f50543..cd26164db6fa 100644 --- a/analytical_engine/apps/java_pie/java_pie_projected_default_app.h +++ b/analytical_engine/apps/java_pie/java_pie_projected_default_app.h @@ -36,19 +36,19 @@ namespace gs { * * @tparam FRAG_T Should be gs::ArrowProjectedFragment<...> */ -template class JavaPIEProjectedDefaultApp : public AppBase>, public grape::Communicator { public: // specialize the templated worker. - INSTALL_DEFAULT_WORKER(JavaPIEProjectedDefaultApp, - JavaPIEProjectedDefaultContext, FRAG_T) + INSTALL_DEFAULT_WORKER(JavaPIEProjectedDefaultApp, + JavaPIEProjectedDefaultContext, FRAG_T); static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; - static constexpr grape::MessageStrategy message_strategy = - _message_strategy; + static constexpr grape::MessageStrategy message_strategy = _message_strategy; static constexpr bool need_split_edges = true; public: diff --git a/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h b/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h index f9a0d5bd9b6b..2f39776dc403 100644 --- a/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h +++ b/analytical_engine/apps/java_pie/java_pie_projected_parallel_app.h @@ -45,12 +45,11 @@ class JavaPIEProjectedParallelApp public grape::Communicator { public: // specialize the templated worker. - INSTALL_PARALLEL_WORKER(JavaPIEProjectedParallelApp, + INSTALL_JAVA_PARALLEL_WORKER(JavaPIEProjectedParallelApp, JavaPIEProjectedParallelContext, FRAG_T) static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; - static constexpr grape::MessageStrategy message_strategy = - _message_strategy; + static constexpr grape::MessageStrategy message_strategy = _message_strategy; static constexpr bool need_split_edges = true; public: diff --git a/analytical_engine/apps/java_pie/java_pie_property_default_app.h b/analytical_engine/apps/java_pie/java_pie_property_default_app.h index 2eca464da984..2f0cda930380 100644 --- a/analytical_engine/apps/java_pie/java_pie_property_default_app.h +++ b/analytical_engine/apps/java_pie/java_pie_property_default_app.h @@ -44,9 +44,9 @@ class JavaPIEPropertyDefaultApp public grape::Communicator { public: // specialize the templated worker. - INSTALL_DEFAULT_PROPERTY_WORKER( - JavaPIEPropertyDefaultApp, - JavaPIEPropertyDefaultContext, FRAG_T) + INSTALL_DEFAULT_PROPERTY_WORKER(JavaPIEPropertyDefaultApp, + JavaPIEPropertyDefaultContext, + FRAG_T); static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; static constexpr grape::MessageStrategy message_strategy = _message_strategy; diff --git a/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h b/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h index 20f61ead4a11..39caad6a9acf 100644 --- a/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h +++ b/analytical_engine/apps/java_pie/java_pie_property_parallel_app.h @@ -27,7 +27,9 @@ limitations under the License. #include "core/app/parallel_property_app_base.h" #include "core/context/java_pie_property_context.h" #include "core/error.h" +#include "core/java/utils.h" #include "core/worker/parallel_property_worker.h" + namespace gs { /** @@ -45,8 +47,9 @@ class JavaPIEPropertyParallelApp public grape::Communicator { public: // specialize the templated worker. - INSTALL_PROPERTY_WORKER(JavaPIEPropertyParallelApp, - JavaPIEPropertyParallelContext, FRAG_T) + INSTALL_JAVA_PARALLEL_PROPERTY_WORKER(JavaPIEPropertyParallelApp, + JavaPIEPropertyParallelContext, + FRAG_T); static constexpr grape::LoadStrategy load_strategy = grape::LoadStrategy::kBothOutIn; static constexpr grape::MessageStrategy message_strategy = _message_strategy; diff --git a/analytical_engine/core/java/utils.h b/analytical_engine/core/java/utils.h index 71bb8add58a3..2d649541afbf 100644 --- a/analytical_engine/core/java/utils.h +++ b/analytical_engine/core/java/utils.h @@ -27,6 +27,26 @@ #include "boost/property_tree/ptree.hpp" namespace gs { +#define INSTALL_JAVA_PARALLEL_WORKER(APP_T, CONTEXT_T, FRAG_T) \ + public: \ + using fragment_t = FRAG_T; \ + using context_t = CONTEXT_T; \ + using message_manager_t = grape::ParallelMessageManager; \ + using worker_t = grape::ParallelWorker; \ + static std::shared_ptr CreateWorker( \ + std::shared_ptr app, std::shared_ptr frag) { \ + return std::shared_ptr(new worker_t(app, frag)); \ + } +#define INSTALL_JAVA_PARALLEL_PROPERTY_WORKER(APP_T, CONTEXT_T, FRAG_T) \ +public: \ +using fragment_t = FRAG_T; \ +using context_t = CONTEXT_T; \ +using message_manager_t = ParallelPropertyMessageManager; \ +using worker_t = ParallelPropertyWorker; \ +static std::shared_ptr CreateWorker( \ + std::shared_ptr app, std::shared_ptr frag) { \ + return std::shared_ptr(new worker_t(app, frag)); \ +} // data vector contains all bytes, can be used to hold oid and vdata, edata. using byte_vector = std::vector; // offset vector contains offsets to deserialize data vector. From d1ff9ac24009626761322eb0ccc029634a41a88c Mon Sep 17 00:00:00 2001 From: zhanglei1949 Date: Mon, 17 Oct 2022 16:38:44 +0800 Subject: [PATCH 04/10] format --- Makefile | 2 +- analytical_engine/core/java/utils.h | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ed89e0c09a0e..cd0507ca7c9d 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ gae: mkdir -p $(WORKING_DIR)/analytical_engine/build cd $(WORKING_DIR)/analytical_engine/build && \ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) -DNETWORKX=$(NETWORKX) -DBUILD_TESTS=${BUILD_TEST} -DENABLE_JAVA_SDK=${ENABLE_JAVA_SDK} .. && \ - make -j1 && \ + make -j && \ sudo make install && \ sudo cp -r $(WORKING_DIR)/k8s/kube_ssh $(INSTALL_PREFIX)/bin/ ifneq ($(INSTALL_PREFIX), /usr/local) diff --git a/analytical_engine/core/java/utils.h b/analytical_engine/core/java/utils.h index 2d649541afbf..1155747c31a6 100644 --- a/analytical_engine/core/java/utils.h +++ b/analytical_engine/core/java/utils.h @@ -27,7 +27,7 @@ #include "boost/property_tree/ptree.hpp" namespace gs { -#define INSTALL_JAVA_PARALLEL_WORKER(APP_T, CONTEXT_T, FRAG_T) \ +#define INSTALL_JAVA_PARALLEL_WORKER(APP_T, CONTEXT_T, FRAG_T) \ public: \ using fragment_t = FRAG_T; \ using context_t = CONTEXT_T; \ @@ -38,15 +38,15 @@ namespace gs { return std::shared_ptr(new worker_t(app, frag)); \ } #define INSTALL_JAVA_PARALLEL_PROPERTY_WORKER(APP_T, CONTEXT_T, FRAG_T) \ -public: \ -using fragment_t = FRAG_T; \ -using context_t = CONTEXT_T; \ -using message_manager_t = ParallelPropertyMessageManager; \ -using worker_t = ParallelPropertyWorker; \ -static std::shared_ptr CreateWorker( \ - std::shared_ptr app, std::shared_ptr frag) { \ - return std::shared_ptr(new worker_t(app, frag)); \ -} + public: \ + using fragment_t = FRAG_T; \ + using context_t = CONTEXT_T; \ + using message_manager_t = ParallelPropertyMessageManager; \ + using worker_t = ParallelPropertyWorker; \ + static std::shared_ptr CreateWorker( \ + std::shared_ptr app, std::shared_ptr frag) { \ + return std::shared_ptr(new worker_t(app, frag)); \ + } // data vector contains all bytes, can be used to hold oid and vdata, edata. using byte_vector = std::vector; // offset vector contains offsets to deserialize data vector. From d80ac68d273199f2a868d3db6314e3995737dd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Mon, 17 Oct 2022 19:21:07 +0800 Subject: [PATCH 05/10] make -j1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cd0507ca7c9d..ed89e0c09a0e 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ gae: mkdir -p $(WORKING_DIR)/analytical_engine/build cd $(WORKING_DIR)/analytical_engine/build && \ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) -DNETWORKX=$(NETWORKX) -DBUILD_TESTS=${BUILD_TEST} -DENABLE_JAVA_SDK=${ENABLE_JAVA_SDK} .. && \ - make -j && \ + make -j1 && \ sudo make install && \ sudo cp -r $(WORKING_DIR)/k8s/kube_ssh $(INSTALL_PREFIX)/bin/ ifneq ($(INSTALL_PREFIX), /usr/local) From 5ea5f36da5adc350410b6f974f5ca1eb61c76b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Mon, 17 Oct 2022 22:03:12 +0800 Subject: [PATCH 06/10] f --- analytical_engine/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analytical_engine/java/pom.xml b/analytical_engine/java/pom.xml index abc83f374996..3b660ae9bb8a 100644 --- a/analytical_engine/java/pom.xml +++ b/analytical_engine/java/pom.xml @@ -53,7 +53,7 @@ 3.0.0-M4 UTF-8 1.7.30 - 2.19.0 + 2.17.2 4.1.44.Final 6.5.4 4.0.0 From e2ed3f2587b39167d8a550afc60ef4cf8f832d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Tue, 18 Oct 2022 09:51:21 +0800 Subject: [PATCH 07/10] remove module info class --- analytical_engine/java/grape-demo/pom.xml | 1 + analytical_engine/java/grape-runtime/pom.xml | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/analytical_engine/java/grape-demo/pom.xml b/analytical_engine/java/grape-demo/pom.xml index 9a364e829626..0b20edb9f0b7 100644 --- a/analytical_engine/java/grape-demo/pom.xml +++ b/analytical_engine/java/grape-demo/pom.xml @@ -145,6 +145,7 @@ *:* + module-info.class META-INF/*.SF META-INF/*.DSA META-INF/*.RSA diff --git a/analytical_engine/java/grape-runtime/pom.xml b/analytical_engine/java/grape-runtime/pom.xml index 7f86b29ec4b8..9504c054a604 100644 --- a/analytical_engine/java/grape-runtime/pom.xml +++ b/analytical_engine/java/grape-runtime/pom.xml @@ -113,6 +113,17 @@ true + + + *:* + + module-info.class + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + From e1c94410909ca492922e7797d31836118a2a5346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Tue, 18 Oct 2022 10:46:50 +0800 Subject: [PATCH 08/10] update --- analytical_engine/CMakeLists.txt | 16 ++++++++-------- analytical_engine/java/pom.xml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/analytical_engine/CMakeLists.txt b/analytical_engine/CMakeLists.txt index 05d03c68d3e1..29b78cfeb231 100644 --- a/analytical_engine/CMakeLists.txt +++ b/analytical_engine/CMakeLists.txt @@ -233,19 +233,19 @@ target_link_libraries(gs_proto add_library(gs_util SHARED "core/flags.cc" "core/launcher.cc") target_link_libraries(gs_util PRIVATE - ${LIBGRAPELITE_LIBRARIES} - ${GFLAGS_LIBRARIES} - ${VINEYARD_LIBRARIES} - ${Boost_LIBRARIES} -) + ${LIBGRAPELITE_LIBRARIES} + ${GFLAGS_LIBRARIES} + ${VINEYARD_LIBRARIES} + ${Boost_LIBRARIES} + ) if (ENABLE_JAVA_SDK) target_sources(gs_util PRIVATE "core/java/javasdk.cc") target_compile_definitions(gs_util PUBLIC ENABLE_JAVA_SDK) target_link_libraries(gs_util PRIVATE - ${JAVA_JVM_LIBRARY} - ${JNI_LIBRARIES} - ) + ${JAVA_JVM_LIBRARY} + ${JNI_LIBRARIES} + ) endif() add_executable(grape_engine diff --git a/analytical_engine/java/pom.xml b/analytical_engine/java/pom.xml index 3b660ae9bb8a..abc83f374996 100644 --- a/analytical_engine/java/pom.xml +++ b/analytical_engine/java/pom.xml @@ -53,7 +53,7 @@ 3.0.0-M4 UTF-8 1.7.30 - 2.17.2 + 2.19.0 4.1.44.Final 6.5.4 4.0.0 From abd37d3a079a454182c05331a27bcbf222b49823 Mon Sep 17 00:00:00 2001 From: zhanglei1949 Date: Tue, 18 Oct 2022 13:21:56 +0800 Subject: [PATCH 09/10] f --- analytical_engine/java/grape-runtime/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analytical_engine/java/grape-runtime/pom.xml b/analytical_engine/java/grape-runtime/pom.xml index 9504c054a604..95aaf239c53f 100644 --- a/analytical_engine/java/grape-runtime/pom.xml +++ b/analytical_engine/java/grape-runtime/pom.xml @@ -117,7 +117,7 @@ *:* - module-info.class + META-INF/versions/** META-INF/*.SF META-INF/*.DSA META-INF/*.RSA From 3d9f66f8b428d00c6c5aee2ee2336291eaad1473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=84=E7=A3=8A?= Date: Tue, 18 Oct 2022 13:24:12 +0800 Subject: [PATCH 10/10] f --- analytical_engine/java/graphx-on-graphscope/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analytical_engine/java/graphx-on-graphscope/pom.xml b/analytical_engine/java/graphx-on-graphscope/pom.xml index 7c32a9d93ee7..e7c2b3d9efd1 100644 --- a/analytical_engine/java/graphx-on-graphscope/pom.xml +++ b/analytical_engine/java/graphx-on-graphscope/pom.xml @@ -24,7 +24,7 @@ graphx-on-graphscope jar - Graphx on GraphScope + GraphX on GraphScope 8