Merge pull request #9652 from zmstone/1230-sync-release-v44-to-main-v4.4

1230 sync release v44 to main v4.4

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.13"}, % strict semver, bump manually!
+  {vsn, "4.4.14"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]},
   {applications, [kernel,stdlib,rulesql,getopt,jose]},

apps/emqx_rule_engine/src/emqx_rule_engine.appup.src

@@ -1,11 +1,12 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.4.12",
+  [{"4.4.13",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
-    [{load_module,emqx_rule_engine_jwt_worker,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,[]},
+     {load_module,emqx_rule_engine_jwt,brutal_purge,soft_purge,[]}]},
-     {load_module,emqx_rule_registry,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},
@@ -220,11 +221,12 @@
      {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.4.12",
+  [{"4.4.13",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
-    [{load_module,emqx_rule_engine_jwt_worker,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,[]},
+     {load_module,emqx_rule_engine_jwt,brutal_purge,soft_purge,[]}]},
-     {load_module,emqx_rule_registry,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},

changes/v4.4.13-en.md

@@ -5,4 +5,4 @@
 
 ## Bug Fixes
 
-- Fix an issue where testing the GCP PubSub could leak memory, and an issue where its JWT token would fail to refresh a second time [#9640](https://github.com/emqx/emqx/pull/9640).
+- Fix an issue where testing the GCP PubSub could leak memory, and an issue where its JWT token would fail to refresh a second time. [#9650](https://github.com/emqx/emqx/pull/9650)

changes/v4.4.13-zh.md

@@ -5,4 +5,4 @@
 
 ## 修复
 
-- 修复了测试 GCP PubSub 可能泄露内存的问题，以及其 JWT 令牌第二次刷新失败的问题 [#9640](https://github.com/emqx/emqx/pull/9640)。
+- 修复了测试GCP PubSub可能泄露内存的问题，以及其JWT令牌第二次刷新失败的问题。 [#9650](https://github.com/emqx/emqx/pull/9650)

changes/v4.4.14-en.md

@@ -0,0 +1,7 @@
+# v4.4.14
+
+## Enhancements
+
+
+## Bug Fixes
+

changes/v4.4.14-zh.md

@@ -0,0 +1,6 @@
+# v4.4.14
+
+## 增强
+
+
+## 修复

data/relup-paths.eterm

@@ -53,11 +53,18 @@
    otp => <<"24.3.4.2-1">>}}.
 {<<"4.4.13">>,
  #{from_versions =>
-       [<<"4.4.0">>,<<"4.4.1">>,<<"4.4.2">>,<<"4.4.3">>,<<"4.4.4">>,
+       [<<"4.4.0">>,<<"4.4.1">>,<<"4.4.10">>,<<"4.4.11">>,<<"4.4.12">>,
-        <<"4.4.5">>,<<"4.4.6">>,<<"4.4.7">>,<<"4.4.8">>,<<"4.4.9">>,
+        <<"4.4.2">>,<<"4.4.3">>,<<"4.4.4">>,<<"4.4.5">>,<<"4.4.6">>,
-        <<"4.4.10">>,<<"4.4.11">>,<<"4.4.12">>],
+        <<"4.4.7">>,<<"4.4.8">>,<<"4.4.9">>],
+   otp => <<"24.3.4.2-1">>}}.
+{<<"4.4.14">>,
+ #{from_versions =>
+       [<<"4.4.0">>,<<"4.4.1">>,<<"4.4.10">>,<<"4.4.11">>,<<"4.4.12">>,
+        <<"4.4.13">>,<<"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.8">>,<<"4.4.9">>,<<"4.4.10">>,
+ #{from_versions =>
-                     <<"4.4.11">>],
+       [<<"4.4.10">>,<<"4.4.11">>,<<"4.4.13">>,<<"4.4.14">>,<<"4.4.8">>,
+        <<"4.4.9">>],
    otp => <<"24.3.4.2-1">>}}.

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.13
+version: 4.4.14
 
 # 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.13
+appVersion: 4.4.14

include/emqx_release.hrl

@@ -29,7 +29,7 @@
 
 -ifndef(EMQX_ENTERPRISE).
 
--define(EMQX_RELEASE, {opensource, "4.4.13-alpha.1"}).
+-define(EMQX_RELEASE, {opensource, "4.4.14-alpha.1"}).
 
 -else.
 

lib-ce/emqx_dashboard/src/emqx_dashboard.app.src

@@ -1,6 +1,6 @@
 {application, emqx_dashboard,
  [{description, "EMQX Web Dashboard"},
-  {vsn, "4.4.12"}, % strict semver, bump manually!
+  {vsn, "4.4.13"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_dashboard_sup]},
   {applications, [kernel,stdlib,mnesia,minirest]},

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.13"}, % strict semver, bump manually!
+  {vsn, "4.4.14"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
   {applications, [ kernel

src/emqx.appup.src

@@ -1,9 +1,13 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.4.12",
+  [{"4.4.13",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
-     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_relup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+   {"4.4.12",
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {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",
@@ -394,9 +398,13 @@
      {apply,{application,set_env,
                          [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
    {<<".*">>,[]}],
-  [{"4.4.12",
+  [{"4.4.13",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
-     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_relup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+   {"4.4.12",
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {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",