This is an automated email from the ASF dual-hosted git repository. zhoubo pushed a commit to branch release-5.0.0 in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit ac7e4cbfc9967a9402c204cc26d0d393bb468377 Author: Zhanhui Li <[email protected]> AuthorDate: Fri Sep 16 21:05:14 2022 +0800 Sync DLedger version in Bazel scripts (#5102) * Use dledger from maven * Sync other references --- WORKSPACE | 11 +++++---- broker/BUILD.bazel | 2 +- container/BUILD.bazel | 4 ++-- controller/BUILD.bazel | 4 ++-- store/BUILD.bazel | 42 +++++++++++++--------------------- store/libs/dledger-0.2.8-SNAPSHOT.jar | Bin 186014 -> 0 bytes 6 files changed, 27 insertions(+), 36 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 9bc6419b6..231336eae 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -51,7 +51,7 @@ maven_install( "commons-validator:commons-validator:1.7", "org.apache.commons:commons-lang3:3.4", "org.hamcrest:hamcrest-core:1.3", - # "io.openmessaging.storage:dledger:0.2.4", + "io.openmessaging.storage:dledger:0.3.1", "net.java.dev.jna:jna:4.2.2", "ch.qos.logback:logback-classic:1.2.10", "ch.qos.logback:logback-core:1.2.10", @@ -116,11 +116,12 @@ http_archive( ) http_archive( - name = "bazel_toolchains", - urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/dac71231098d891e5c4b74a2078fe9343feef510.tar.gz";], - strip_prefix = "bazel-toolchains-dac71231098d891e5c4b74a2078fe9343feef510", - sha256 = "56d5370eb99559b4c74f334f81bc8a298f728bd16d5a4333c865c2ad10fae3bc", + name = "bazel_toolchains", + sha256 = "56d5370eb99559b4c74f334f81bc8a298f728bd16d5a4333c865c2ad10fae3bc", + strip_prefix = "bazel-toolchains-dac71231098d891e5c4b74a2078fe9343feef510", + urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/dac71231098d891e5c4b74a2078fe9343feef510.tar.gz";], ) load("@bazel_toolchains//repositories:repositories.bzl", bazel_toolchains_repositories = "repositories") + bazel_toolchains_repositories() diff --git a/broker/BUILD.bazel b/broker/BUILD.bazel index 51afc4f34..1c7403a44 100644 --- a/broker/BUILD.bazel +++ b/broker/BUILD.bazel @@ -29,7 +29,7 @@ java_library( "//filter", "//srvutil", "//acl", - "//store:io_openmessaging_storage_dledger", + "@maven//:io_openmessaging_storage_dledger", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", diff --git a/container/BUILD.bazel b/container/BUILD.bazel index 8986f7ae4..15fc0ae77 100644 --- a/container/BUILD.bazel +++ b/container/BUILD.bazel @@ -28,7 +28,7 @@ java_library( "//client", "//srvutil", "//store", - "//store:io_openmessaging_storage_dledger", + "@maven//:io_openmessaging_storage_dledger", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:commons_collections_commons_collections", @@ -58,7 +58,7 @@ java_library( "//client", "//srvutil", "//store", - "//store:io_openmessaging_storage_dledger", + "@maven//:io_openmessaging_storage_dledger", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", "@maven//:io_netty_netty_all", diff --git a/controller/BUILD.bazel b/controller/BUILD.bazel index 0e1cc9169..ef9b9c5eb 100644 --- a/controller/BUILD.bazel +++ b/controller/BUILD.bazel @@ -26,7 +26,7 @@ java_library( "//remoting", "//client", "//srvutil", - "//store:io_openmessaging_storage_dledger", + "@maven//:io_openmessaging_storage_dledger", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:commons_collections_commons_collections", @@ -54,7 +54,7 @@ java_library( "//remoting", "//client", "//srvutil", - "//store:io_openmessaging_storage_dledger", + "@maven//:io_openmessaging_storage_dledger", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", "@maven//:io_netty_netty_all", diff --git a/store/BUILD.bazel b/store/BUILD.bazel index fef1404de..b839e72de 100644 --- a/store/BUILD.bazel +++ b/store/BUILD.bazel @@ -16,57 +16,43 @@ # load("//bazel:GenTestRules.bzl", "GenTestRules") -java_import( - name = "io_openmessaging_storage_dledger", - jars = [ - "libs/dledger-0.2.8-SNAPSHOT.jar", - ], - visibility = ["//visibility:public"], -) - java_library( name = "store", srcs = glob(["src/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//logging", "//common", + "//logging", "//remoting", - # "@maven//:io_openmessaging_storage_dledger", - ":io_openmessaging_storage_dledger", - "@maven//:net_java_dev_jna_jna", - "@maven//:org_apache_commons_commons_lang3", - "@maven//:commons_collections_commons_collections", - "@maven//:com_conversantmedia_disruptor", "@maven//:com_alibaba_fastjson", - "@maven//:io_netty_netty_all", + "@maven//:com_conversantmedia_disruptor", "@maven//:com_google_guava_guava", + "@maven//:commons_collections_commons_collections", + "@maven//:io_netty_netty_all", + "@maven//:io_openmessaging_storage_dledger", + "@maven//:net_java_dev_jna_jna", + "@maven//:org_apache_commons_commons_lang3", ], ) java_library( name = "tests", srcs = glob(["src/test/java/**/*.java"]), + resources = glob(["src/test/resources/certs/*.pem"]) + glob(["src/test/resources/certs/*.key"]), visibility = ["//visibility:public"], deps = [ ":store", "//:test_deps", - "//logging", "//common", - # "@maven//:io_openmessaging_storage_dledger", - ":io_openmessaging_storage_dledger", - "@maven//:org_apache_commons_commons_lang3", - "@maven//:com_conversantmedia_disruptor", + "//logging", + "@maven//:com_conversantmedia_disruptor", + "@maven//:io_openmessaging_storage_dledger", + "@maven//:org_apache_commons_commons_lang3", ], - resources = glob(["src/test/resources/certs/*.pem"]) + glob(["src/test/resources/certs/*.key"]) ) GenTestRules( name = "GeneratedTestRules", - test_files = glob(["src/test/java/**/*Test.java"]), - deps = [ - ":tests", - ], exclude_tests = [ "src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest", "src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest", @@ -77,4 +63,8 @@ GenTestRules( "src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest", "src/test/java/org/apache/rocketmq/store/HATest", ], + test_files = glob(["src/test/java/**/*Test.java"]), + deps = [ + ":tests", + ], ) diff --git a/store/libs/dledger-0.2.8-SNAPSHOT.jar b/store/libs/dledger-0.2.8-SNAPSHOT.jar deleted file mode 100644 index d6919de58..000000000 Binary files a/store/libs/dledger-0.2.8-SNAPSHOT.jar and /dev/null differ
