From 8b20a703449d67ed53d9ad2084c25144e0f36d05 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Mon, 19 Jun 2023 15:57:40 +0800
Subject: [PATCH 1/3] chore: hide plugins from conf load cli

---
 apps/emqx_conf/src/emqx_conf_cli.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_conf/src/emqx_conf_cli.erl b/apps/emqx_conf/src/emqx_conf_cli.erl
index 70e9c3a5e..7e5a5b891 100644
--- a/apps/emqx_conf/src/emqx_conf_cli.erl
+++ b/apps/emqx_conf/src/emqx_conf_cli.erl
@@ -170,7 +170,7 @@ drop_hidden_roots(Conf) ->
     lists:foldl(fun(K, Acc) -> maps:remove(K, Acc) end, Conf, hidden_roots()).
 
 hidden_roots() ->
-    [<<"trace">>, <<"stats">>, <<"broker">>, <<"persistent_session_store">>].
+    [<<"trace">>, <<"stats">>, <<"broker">>, <<"persistent_session_store">>, <<"plugins">>].
 
 get_config(Key) ->
     case emqx:get_raw_config([Key], undefined) of

From 4071acfbd88a88b46dd9e4c5ca9cfaa644f9fcc6 Mon Sep 17 00:00:00 2001
From: YuShifan <894402575bt@gmail.com>
Date: Mon, 19 Jun 2023 15:46:43 +0800
Subject: [PATCH 2/3] chore: upgrade dashboard to e1.1.0-beta.8 for ee and
 v1.3.0-1 for ce

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f04f2fd77..22eff4c2f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ endif
 
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
-export EMQX_DASHBOARD_VERSION ?= v1.3.0
-export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.7
+export EMQX_DASHBOARD_VERSION ?= v1.3.0-1
+export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.8
 
 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
 # In make 4.4+, for backward-compatibility the value from the original environment is used.

From a578d6fa1d35b17c85df61923f2b361d646259bb Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Mon, 19 Jun 2023 17:16:53 +0800
Subject: [PATCH 3/3] chore: release e5.1.0-alpha.8

---
 Makefile                           | 2 +-
 apps/emqx/include/emqx_release.hrl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 22eff4c2f..533af9c05 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
 export EMQX_DASHBOARD_VERSION ?= v1.3.0-1
-export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.8
+export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.9
 
 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
 # In make 4.4+, for backward-compatibility the value from the original environment is used.
diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl
index fe37a75ff..f23916960 100644
--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.1.0-alpha.5").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.1.0-alpha.7").
+-define(EMQX_RELEASE_EE, "5.1.0-alpha.8").
 
 %% The HTTP API version
 -define(EMQX_API_VERSION, "5.0").