From 6b553e37c07a80ed6b52aa94a962e54f9ddc2a06 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 6 Dec 2023 15:01:40 +0100
Subject: [PATCH] chore: pin ekka 0.17.0 previously 0.15.16

change summary:
1. otp 26
2. type spec fixes
3. dropped UDP mcast clustering
---
 apps/emqx/rebar.config                        | 2 +-
 apps/emqx_machine/test/emqx_machine_SUITE.erl | 2 +-
 mix.exs                                       | 2 +-
 rebar.config                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 27c7500d7..62d7cc0b5 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -28,7 +28,7 @@
     {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}},
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.9"}}},
-    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.16"}}},
+    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.17.0"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.3.0"}}},
     {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.40.0"}}},
     {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.3"}}},
diff --git a/apps/emqx_machine/test/emqx_machine_SUITE.erl b/apps/emqx_machine/test/emqx_machine_SUITE.erl
index 78e95d083..7b64df05c 100644
--- a/apps/emqx_machine/test/emqx_machine_SUITE.erl
+++ b/apps/emqx_machine/test/emqx_machine_SUITE.erl
@@ -93,7 +93,7 @@ t_custom_shard_transports(_Config) ->
     Shard = test_shard,
     %% the config keys are binaries
     ShardBin = atom_to_binary(Shard),
-    DefaultTransport = gen_rpc,
+    DefaultTransport = distr,
     ?assertEqual(DefaultTransport, mria_config:shard_transport(Shard)),
     application:set_env(emqx_machine, custom_shard_transports, #{ShardBin => distr}),
     emqx_machine:start(),
diff --git a/mix.exs b/mix.exs
index 838e2c86b..598cb3b2d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -55,7 +55,7 @@ defmodule EMQXUmbrella.MixProject do
       {:cowboy, github: "emqx/cowboy", tag: "2.9.2", override: true},
       {:esockd, github: "emqx/esockd", tag: "5.9.9", override: true},
       {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.8.0-emqx-2", override: true},
-      {:ekka, github: "emqx/ekka", tag: "0.15.16", override: true},
+      {:ekka, github: "emqx/ekka", tag: "0.17.0", override: true},
       {:gen_rpc, github: "emqx/gen_rpc", tag: "3.3.0", override: true},
       {:grpc, github: "emqx/grpc-erl", tag: "0.6.12", override: true},
       {:minirest, github: "emqx/minirest", tag: "1.3.15", override: true},
diff --git a/rebar.config b/rebar.config
index 2efcb0e3b..d1e88b482 100644
--- a/rebar.config
+++ b/rebar.config
@@ -71,7 +71,7 @@
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}}
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.9"}}}
     , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.8.0-emqx-2"}}}
-    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.16"}}}
+    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.17.0"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.3.0"}}}
     , {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.12"}}}
     , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.15"}}}