Skip to content

Commit 8cfcd79

Browse files
authored
Merge pull request #14477 from rabbitmq/bump-emqtt
Bump emqtt to v1.14.6
2 parents c791e51 + bb7ead2 commit 8cfcd79

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

deps/rabbitmq_auth_backend_oauth2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
1717

1818
dep_base64url = hex 1.0.1
1919

20-
dep_emqtt = git https://github.com/emqx/emqtt.git 1.11.0
20+
dep_emqtt = git https://github.com/emqx/emqtt.git 1.14.6
2121

2222
# Required to properly autopatch jose.
2323
ELIXIR = system

deps/rabbitmq_mqtt/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TEST_DEPS = cowlib emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helper
4848
PLT_APPS += rabbitmq_cli elixir
4949

5050
dep_ct_helper = git https://github.com/extend/ct_helper.git master
51-
dep_emqtt = git https://github.com/emqx/emqtt.git 1.11.0
51+
dep_emqtt = git https://github.com/emqx/emqtt.git 1.14.6
5252

5353
CT_HOOKS = rabbit_ct_hook
5454
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk

deps/rabbitmq_mqtt/test/reader_SUITE.erl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,7 @@ block_connack_timeout(Config) ->
112112
{proto_ver, ?config(mqtt_version, Config)},
113113
{connect_timeout, 1}]),
114114
unlink(Client),
115-
ClientMRef = monitor(process, Client),
116-
{error, connack_timeout} = emqtt:connect(Client),
117-
receive {'DOWN', ClientMRef, process, Client, connack_timeout} -> ok
118-
after 30_000 -> ct:fail("missing connack_timeout in client")
119-
end,
115+
?assertEqual({error, connack_timeout}, emqtt:connect(Client)),
120116

121117
MqttReader = rpc(Config, ?MODULE, mqtt_connection_pid, [Ports]),
122118
MqttReaderMRef = monitor(process, MqttReader),

deps/rabbitmq_web_mqtt/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ PLT_APPS += rabbitmq_cli elixir cowlib ssl
2727
# See rabbitmq-components.mk.
2828
BUILD_DEPS += ranch
2929

30-
dep_emqtt = git https://github.com/emqx/emqtt.git 1.11.0
30+
dep_emqtt = git https://github.com/emqx/emqtt.git 1.14.6
3131

3232
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
3333
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

0 commit comments

Comments
 (0)