diff options
| author | Michael Klishin <klishinm@vmware.com> | 2022-09-21 21:27:09 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 21:27:09 +0400 |
| commit | c581c765a2aa736ff6cc1efc32d6a93a55471a55 (patch) | |
| tree | 01cadaacb6fe6f622c4e1f04551137d414f01a48 | |
| parent | 35a26c4bb4ce45a6900d399772d0789a7222b13a (diff) | |
| parent | 7fffaaccdac55d76d7d1b9ea52031f10997040d1 (diff) | |
| download | rabbitmq-server-git-c581c765a2aa736ff6cc1efc32d6a93a55471a55.tar.gz | |
Merge pull request #5838 from rabbitmq/mergify/bp/v3.11.x/pr-5836
Point emqtt test dependency to emqx (backport #5836)
| -rw-r--r-- | MODULE.bazel | 4 | ||||
| -rw-r--r-- | deps/rabbitmq_mqtt/Makefile | 2 | ||||
| -rw-r--r-- | workspace_helpers.bzl | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/MODULE.bazel b/MODULE.bazel index 4bcee1c8ec..88748847e9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -148,8 +148,8 @@ erlang_app( erlang_package.git_package( name = "emqtt", - repository = "ansd/emqtt", - commit = "68683689546b081c1cd5efeaa897b619e581fe29", + repository = "emqx/emqtt", + tag = "1.7.0-rc.2", build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app") erlang_app( diff --git a/deps/rabbitmq_mqtt/Makefile b/deps/rabbitmq_mqtt/Makefile index ac0fd995e6..d07c6ba04b 100644 --- a/deps/rabbitmq_mqtt/Makefile +++ b/deps/rabbitmq_mqtt/Makefile @@ -39,7 +39,7 @@ DEPS = ranch rabbit_common rabbit amqp_client ra TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers dep_ct_helper = git https://github.com/extend/ct_helper.git master -dep_emqtt = git https://github.com/ansd/emqtt.git 68683689546b081c1cd5efeaa897b619e581fe29 +dep_emqtt = git https://github.com/emqx/emqtt.git 1.7.0-rc.2 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl index f0a3dfc05f..b407a9bce4 100644 --- a/workspace_helpers.bzl +++ b/workspace_helpers.bzl @@ -238,10 +238,10 @@ sed -i"_orig" -E '/VERSION/ s/[0-9]+\\.[0-9]+\\.[0-9]+/'${VERSION}'/' BUILD.baze github_erlang_app( name = "emqtt", - org = "ansd", + org = "emqx", repo = "emqtt", - version = "68683689546b081c1cd5efeaa897b619e581fe29", - ref = "68683689546b081c1cd5efeaa897b619e581fe29", + version = "1.7.0-rc.2", + ref = "1.7.0-rc.2", build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app") erlang_app( |