chore: bump release -> v4.4.13

2022-12-30 10:30:30 -03:00 · 2022-12-30 10:30:30 -03:00 · bc654ddf3a
parent 05070f416d
commit bc654ddf3a
8 changed files with 75 additions and 36 deletions
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
@ -1,6 +1,6 @@
 {application, emqx_rule_engine,
 [{description, "EMQ X Rule Engine"},
-  {vsn, "4.4.12"}, % strict semver, bump manually!
+  {vsn, "4.4.13"}, % strict semver, bump manually!
  {modules, []},
  {registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]},
  {applications, [kernel,stdlib,rulesql,getopt,jose]},
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src
@ -1,13 +1,20 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.4.11",[
-    {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
-    {load_module,emqx_rule_engine_sup,brutal_purge,soft_purge,[]},
-    {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
-    {apply,{emqx_rule_engine_sup,ensure_api_delegator_started,[]}},
-    {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]}
-   ]},
+  [{"4.4.12",
+    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_jwt_worker,brutal_purge,soft_purge,[]},
+     {update,emqx_rule_engine_jwt_sup,supervisor},
+     {load_module,emqx_rule_engine_jwt,brutal_purge,soft_purge,[]}]},
+   {"4.4.11",
+    [{load_module,emqx_rule_engine_jwt_worker,brutal_purge,soft_purge,[]},
+     {update,emqx_rule_engine_jwt_sup,supervisor},
+     {load_module,emqx_rule_engine_jwt,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_sup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
+     {apply,{emqx_rule_engine_sup,ensure_api_delegator_started,[]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]}]},
   {"4.4.10",
    [{add_module,emqx_rule_engine_jwt},
     {add_module,emqx_rule_engine_jwt_worker},
@ -213,13 +220,20 @@
     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
     {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]},
   {<<".*">>,[]}],
-  [{"4.4.11",[
-    {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
-    {apply,{emqx_rule_engine_sup,ensure_api_delegator_stopped,[]}},
-    {load_module,emqx_rule_engine_sup,brutal_purge,soft_purge,[]},
-    {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
-    {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]}
-   ]},
+  [{"4.4.12",
+    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_jwt_worker,brutal_purge,soft_purge,[]},
+     {update,emqx_rule_engine_jwt_sup,supervisor},
+     {load_module,emqx_rule_engine_jwt,brutal_purge,soft_purge,[]}]},
+   {"4.4.11",
+    [{load_module,emqx_rule_engine_jwt_worker,brutal_purge,soft_purge,[]},
+     {update,emqx_rule_engine_jwt_sup,supervisor},
+     {load_module,emqx_rule_engine_jwt,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {apply,{emqx_rule_engine_sup,ensure_api_delegator_stopped,[]}},
+     {load_module,emqx_rule_engine_sup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]}]},
   {"4.4.10",
    [{load_module,emqx_rule_actions,brutal_purge,soft_purge,[]},
     {apply,{emqx_rule_engine_sup,ensure_api_delegator_stopped,[]}},
--- a/data/relup-paths.eterm
+++ b/data/relup-paths.eterm
@ -51,7 +51,13 @@
        <<"4.4.5">>,<<"4.4.6">>,<<"4.4.7">>,<<"4.4.8">>,<<"4.4.9">>,
        <<"4.4.10">>,<<"4.4.11">>],
   otp => <<"24.3.4.2-1">>}}.
-{<<"4.5.0">>,
- #{from_versions => [<<"4.4.8">>,<<"4.4.9">>,<<"4.4.10">>,
-                     <<"4.4.11">>],
+{<<"4.4.13">>,
+ #{from_versions =>
+       [<<"4.4.0">>,<<"4.4.1">>,<<"4.4.10">>,<<"4.4.11">>,<<"4.4.12">>,
+        <<"4.4.2">>,<<"4.4.3">>,<<"4.4.4">>,<<"4.4.5">>,<<"4.4.6">>,
+        <<"4.4.7">>,<<"4.4.8">>,<<"4.4.9">>],
+   otp => <<"24.3.4.2-1">>}}.
+{<<"4.5.0">>,
+ #{from_versions =>
+       [<<"4.4.10">>,<<"4.4.11">>,<<"4.4.13">>,<<"4.4.8">>,<<"4.4.9">>],
   otp => <<"24.3.4.2-1">>}}.
--- a/deploy/charts/emqx/Chart.yaml
+++ b/deploy/charts/emqx/Chart.yaml
@ -13,8 +13,8 @@ type: application

 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 4.4.12
+version: 4.4.13

 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 4.4.12
+appVersion: 4.4.13
--- a/include/emqx_release.hrl
+++ b/include/emqx_release.hrl
@ -29,7 +29,7 @@

 -ifndef(EMQX_ENTERPRISE).

-define(EMQX_RELEASE, {opensource, "4.4.12"}).
+-define(EMQX_RELEASE, {opensource, "4.4.13"}).

 -else.

--- a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
+++ b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
@ -1,6 +1,6 @@
 {application, emqx_dashboard,
 [{description, "EMQX Web Dashboard"},
-  {vsn, "4.4.11"}, % strict semver, bump manually!
+  {vsn, "4.4.12"}, % strict semver, bump manually!
  {modules, []},
  {registered, [emqx_dashboard_sup]},
  {applications, [kernel,stdlib,mnesia,minirest]},
--- a/src/emqx.app.src
+++ b/src/emqx.app.src
@ -6,7 +6,7 @@
  %% the emqx `release' version, which in turn is comprised of several
  %% apps, one of which is this.  See `emqx_release.hrl' for more
  %% info.
-  {vsn, "4.4.12"}, % strict semver, bump manually!
+  {vsn, "4.4.13"}, % strict semver, bump manually!
  {modules, []},
  {registered, []},
  {applications, [ kernel
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@ -1,7 +1,11 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.4.11",
+  [{"4.4.12",
+    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+     {load_module,emqx_relup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+   {"4.4.11",
    [{add_module,emqx_cover},
     {load_module,emqx_relup,brutal_purge,soft_purge,[]},
     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
@ -27,7 +31,8 @@
     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.9",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -52,7 +57,8 @@
     {load_module,emqx_connection,brutal_purge,soft_purge,[]},
     {load_module,emqx_router,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.8",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -78,7 +84,8 @@
     {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},
     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_message,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.7",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -104,7 +111,8 @@
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.6",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -130,7 +138,8 @@
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.5",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -158,7 +167,8 @@
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx_session,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.4",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -193,7 +203,8 @@
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
     {load_module,emqx_session,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.3",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -235,7 +246,8 @@
     {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_relup},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.2",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -278,7 +290,8 @@
     {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_relup},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.1",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -326,7 +339,8 @@
     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
     {load_module,emqx_connection,brutal_purge,soft_purge,[]},
     {add_module,emqx_relup},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {"4.4.0",
    [{add_module,emqx_cover},
     {add_module,emqx_ocsp_cache},
@ -376,9 +390,14 @@
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_message,brutal_purge,soft_purge,[]},
     {load_module,emqx_limiter,brutal_purge,soft_purge,[]},
-     {apply, {application, set_env, [gen_rpc, insecure_auth_fallback_allowed, true]}}]},
+     {apply,{application,set_env,
+                         [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
   {<<".*">>,[]}],
-  [{"4.4.11",
+  [{"4.4.12",
+    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+     {load_module,emqx_relup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+   {"4.4.11",
    [{load_module,emqx_relup,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_misc,brutal_purge,soft_purge,[]},