From 4330edd674e61ff3d18b666415191101a946198d Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Sat, 23 Apr 2022 10:53:39 +0200
Subject: [PATCH] fix(appup): bump to 4.4.4-beta.1

also fix emqx appup instructions
---
 include/emqx_release.hrl     |  2 +-
 scripts/inject-relup.escript |  2 +-
 src/emqx.appup.src           | 22 ++++++++++------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl
index 5a460f91b..f95494ed8 100644
--- a/include/emqx_release.hrl
+++ b/include/emqx_release.hrl
@@ -29,7 +29,7 @@
 
 -ifndef(EMQX_ENTERPRISE).
 
--define(EMQX_RELEASE, {opensource, "4.4.3"}).
+-define(EMQX_RELEASE, {opensource, "4.4.4-beta.1"}).
 
 -else.
 
diff --git a/scripts/inject-relup.escript b/scripts/inject-relup.escript
index e2d3de795..0ca54361b 100755
--- a/scripts/inject-relup.escript
+++ b/scripts/inject-relup.escript
@@ -123,7 +123,7 @@ do_filter_and_get(Instr, {UpExtra, DnExtra, EmqxMods, RemainInstrs}) ->
 
 assert_mandatory_modules(up, Mods) ->
     assert(lists:member(emqx_relup, Mods) andalso lists:member(emqx_app, Mods),
-        "cannot find any 'load_object_code' instructions for emqx_app and emqx_rel: ~p", [Mods]);
+        "cannot find any 'load_object_code' instructions for emqx_app and emqx_relup: ~p", [Mods]);
 
 assert_mandatory_modules(down, Mods) ->
     assert(lists:member(emqx_app, Mods),
diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index a1b764592..7a04551b2 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -3,10 +3,11 @@
 {VSN,
   [{"4.4.3",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
-     {load_module,emqx_frame,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_frame,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]},
+     {load_module,emqx_relup}]},
    {"4.4.2",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
-     {add_module,emqx_tracer},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
      {load_module,emqx_frame,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys,brutal_purge,soft_purge,[]},
@@ -17,7 +18,6 @@
      {load_module,emqx_relup}]},
    {"4.4.1",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
-     {add_module,emqx_tracer},
      {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
      {load_module,emqx_listeners,brutal_purge,soft_purge,[]},
@@ -42,7 +42,6 @@
      {add_module,emqx_relup}]},
    {"4.4.0",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
-     {add_module,emqx_tracer},
      {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
      {load_module,emqx_listeners,brutal_purge,soft_purge,[]},
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
@@ -73,8 +72,10 @@
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
   [{"4.4.3",
-    [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
-     {load_module,emqx_frame,brutal_purge,soft_purge,[]}]},
+    [{load_module,emqx_relup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
+     {load_module,emqx_frame,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.4.2",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
@@ -84,8 +85,7 @@
      {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
-     {load_module,emqx_relup},
-     {delete_module,emqx_tracer}]},
+     {load_module,emqx_relup}]},
    {"4.4.1",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]},
@@ -109,8 +109,7 @@
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx_connection,brutal_purge,soft_purge,[]},
-     {delete_module,emqx_relup},
-     {delete_module,emqx_tracer}]},
+     {delete_module,emqx_relup}]},
    {"4.4.0",
     [{load_module,emqx_access_rule,brutal_purge,soft_purge,[]},
      {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
@@ -139,6 +138,5 @@
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]},
-     {delete_module,emqx_relup},
-     {delete_module,emqx_tracer}]},
+     {delete_module,emqx_relup}]},
    {<<".*">>,[]}]}.