From 51cd83e70fc12b8092b826c82eb9b4d43d53b961 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 18 Jan 2023 08:12:43 +0100
Subject: [PATCH 1/3] refactor: delete dead code

---
 apps/emqx_machine/src/emqx_machine.erl | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl
index 6872b150c..aa8f03ae5 100644
--- a/apps/emqx_machine/src/emqx_machine.erl
+++ b/apps/emqx_machine/src/emqx_machine.erl
@@ -43,7 +43,7 @@ start() ->
     start_sysmon(),
     configure_shard_transports(),
     ekka:start(),
-    ok = print_otp_version_warning().
+    ok.
 
 graceful_shutdown() ->
     emqx_machine_terminator:graceful_wait().
@@ -61,17 +61,6 @@ set_backtrace_depth() ->
 is_ready() ->
     emqx_machine_terminator:is_running().
 
--if(?OTP_RELEASE > 22).
-print_otp_version_warning() -> ok.
--else.
-print_otp_version_warning() ->
-    ?ULOG(
-        "WARNING: Running on Erlang/OTP version ~p. Recommended: 23~n",
-        [?OTP_RELEASE]
-    ).
-% OTP_RELEASE > 22
--endif.
-
 start_sysmon() ->
     _ = application:load(system_monitor),
     application:set_env(system_monitor, node_status_fun, {?MODULE, node_status}),

From d89975c6eedaa6bbc61c4799faa2356bd98f70da Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 18 Jan 2023 08:20:56 +0100
Subject: [PATCH 2/3] test: add a test case for emqx_machine:node_status

---
 apps/emqx_machine/src/emqx_machine.app.src    |  2 +-
 apps/emqx_machine/test/emqx_machine_SUITE.erl | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_machine/src/emqx_machine.app.src b/apps/emqx_machine/src/emqx_machine.app.src
index 6bd36aab5..a44d2b36e 100644
--- a/apps/emqx_machine/src/emqx_machine.app.src
+++ b/apps/emqx_machine/src/emqx_machine.app.src
@@ -3,7 +3,7 @@
     {id, "emqx_machine"},
     {description, "The EMQX Machine"},
     % strict semver, bump manually!
-    {vsn, "0.2.2"},
+    {vsn, "0.2.3"},
     {modules, []},
     {registered, []},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_machine/test/emqx_machine_SUITE.erl b/apps/emqx_machine/test/emqx_machine_SUITE.erl
index 691cda677..02d03d983 100644
--- a/apps/emqx_machine/test/emqx_machine_SUITE.erl
+++ b/apps/emqx_machine/test/emqx_machine_SUITE.erl
@@ -103,3 +103,13 @@ t_custom_shard_transports(_Config) ->
     emqx_machine:start(),
     ?assertEqual(distr, mria_config:shard_transport(Shard)),
     ok.
+
+t_node_status(_Config) ->
+    JSON = emqx_machine:node_status(),
+    ?assertMatch(
+        #{
+            <<"backend">> := _,
+            <<"role">> := <<"core">>
+        },
+        jsx:decode(JSON)
+    ).

From 0c284ce5fed6e62dccf03289fc4458c5e86fb95f Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 26 Apr 2023 20:50:06 +0200
Subject: [PATCH 3/3] chore: bump app versions

---
 apps/emqx_conf/src/emqx_conf.app.src             | 2 +-
 apps/emqx_dashboard/src/emqx_dashboard.app.src   | 2 +-
 apps/emqx_management/src/emqx_management.app.src | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src
index 03cd36522..e6c3d9cd9 100644
--- a/apps/emqx_conf/src/emqx_conf.app.src
+++ b/apps/emqx_conf/src/emqx_conf.app.src
@@ -1,6 +1,6 @@
 {application, emqx_conf, [
     {description, "EMQX configuration management"},
-    {vsn, "0.1.18"},
+    {vsn, "0.1.19"},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_dashboard/src/emqx_dashboard.app.src b/apps/emqx_dashboard/src/emqx_dashboard.app.src
index 8c7e424e0..bd022f226 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard.app.src
+++ b/apps/emqx_dashboard/src/emqx_dashboard.app.src
@@ -2,7 +2,7 @@
 {application, emqx_dashboard, [
     {description, "EMQX Web Dashboard"},
     % strict semver, bump manually!
-    {vsn, "5.0.19"},
+    {vsn, "5.0.20"},
     {modules, []},
     {registered, [emqx_dashboard_sup]},
     {applications, [kernel, stdlib, mnesia, minirest, emqx, emqx_ctl]},
diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
index ec282b60b..34f3dd1fe 100644
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@@ -2,7 +2,7 @@
 {application, emqx_management, [
     {description, "EMQX Management API and CLI"},
     % strict semver, bump manually!
-    {vsn, "5.0.20"},
+    {vsn, "5.0.21"},
     {modules, []},
     {registered, [emqx_management_sup]},
     {applications, [kernel, stdlib, emqx_plugins, minirest, emqx, emqx_ctl]},