From bc654ddf3a061664c1237d3b94ec1271ebf4b9a3 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 30 Dec 2022 10:30:30 -0300 Subject: [PATCH] chore: bump release -> v4.4.13 --- .../src/emqx_rule_engine.app.src | 2 +- .../src/emqx_rule_engine.appup.src | 42 +++++++++++------ data/relup-paths.eterm | 12 +++-- deploy/charts/emqx/Chart.yaml | 4 +- include/emqx_release.hrl | 2 +- .../emqx_dashboard/src/emqx_dashboard.app.src | 2 +- src/emqx.app.src | 2 +- src/emqx.appup.src | 45 +++++++++++++------ 8 files changed, 75 insertions(+), 36 deletions(-) diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src index 9996a2e46..8c1feb42f 100644 --- 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]}, diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src index 4b392eb01..6a11776ed 100644 --- 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,[]}}, diff --git a/data/relup-paths.eterm b/data/relup-paths.eterm index a1f7e912c..c72c4bc50 100644 --- 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">>}}. diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index a4f2e1a6d..523793eef 100644 --- 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 diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 2c3a9be57..f31e4650b 100644 --- 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. diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src index c9c273344..38a5ee5a2 100644 --- 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]}, diff --git a/src/emqx.app.src b/src/emqx.app.src index 47b9cd084..6d9aeb76f 100644 --- 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 diff --git a/src/emqx.appup.src b/src/emqx.appup.src index b41e751d6..b8cbdf684 100644 --- 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,[]},