From 3a735d8f5d962e215e7e1cfa26a78d39c50b4332 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 28 Feb 2023 17:42:33 +0800
Subject: [PATCH] chore: bump app.src and appup.src. update changes.md

---
 .../src/emqx_plugin_libs.app.src              |  2 +-
 .../src/emqx_plugin_libs.appup.src            | 33 ++++++++++---------
 apps/emqx_web_hook/src/emqx_web_hook.app.src  |  2 +-
 .../emqx_web_hook/src/emqx_web_hook.appup.src |  8 +++--
 changes/v4.4.15-en.md                         |  2 ++
 changes/v4.4.15-zh.md                         |  2 ++
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
index 2b59d095b..39eb2f0fe 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
@@ -1,6 +1,6 @@
 {application, emqx_plugin_libs,
  [{description, "EMQ X Plugin utility libs"},
-  {vsn, "4.4.6"},
+  {vsn, "4.4.7"},
   {modules, []},
   {applications, [kernel,stdlib]},
   {env, []}
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src b/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
index b1042d289..cbc9eaed3 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
@@ -1,14 +1,16 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [
-  {<<"4\\.4\\.[3-5]">>,
+  [{"4.4.6",
+    [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]}]},
+   {<<"4\\.4\\.[3-5]">>,
     [{load_module,emqx_trace,brutal_purge,soft_purge,[]},
-    {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
-   {"4.4.2",[
-   {load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]},
-   {load_module,emqx_trace,brutal_purge,soft_purge,[]},
-   {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_trace_api,brutal_purge,soft_purge,[]},
+     {load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]}]},
+   {"4.4.2",
+    [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]},
+     {load_module,emqx_trace,brutal_purge,soft_purge,[]},
+     {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
    {"4.4.1",
     [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]},
      {load_module,emqx_trace,brutal_purge,soft_purge,[]},
@@ -20,17 +22,16 @@
      {update,emqx_slow_subs,{advanced,["4.4.0"]}},
      {load_module,emqx_slow_subs_api,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [
-  {<<"4\\.4\\.[3-5]">>,
+  [{"4.4.6",
+    [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]}]},
+   {<<"4\\.4\\.[3-5]">>,
     [{load_module,emqx_trace,brutal_purge,soft_purge,[]},
-     {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
-   {"4.4.3",
-     [{load_module,emqx_trace,brutal_purge,soft_purge,[]},
-      {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_trace_api,brutal_purge,soft_purge,[]},
+     {load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]}]},
    {"4.4.2",
-     [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]},
-      {load_module,emqx_trace,brutal_purge,soft_purge,[]},
-      {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
+    [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]},
+     {load_module,emqx_trace,brutal_purge,soft_purge,[]},
+     {load_module,emqx_trace_api,brutal_purge,soft_purge,[]}]},
    {"4.4.1",
     [{load_module,emqx_plugin_libs_ssl,brutal_purge,soft_purge,[]},
      {load_module,emqx_trace,brutal_purge,soft_purge,[]},
diff --git a/apps/emqx_web_hook/src/emqx_web_hook.app.src b/apps/emqx_web_hook/src/emqx_web_hook.app.src
index 34050490b..b3ac93ef2 100644
--- a/apps/emqx_web_hook/src/emqx_web_hook.app.src
+++ b/apps/emqx_web_hook/src/emqx_web_hook.app.src
@@ -1,6 +1,6 @@
 {application, emqx_web_hook,
  [{description, "EMQ X WebHook Plugin"},
-  {vsn, "4.3.16"}, % strict semver, bump manually!
+  {vsn, "4.3.17"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_web_hook_sup]},
   {applications, [kernel,stdlib,ehttpc]},
diff --git a/apps/emqx_web_hook/src/emqx_web_hook.appup.src b/apps/emqx_web_hook/src/emqx_web_hook.appup.src
index b66a1eb96..b9ed1f687 100644
--- a/apps/emqx_web_hook/src/emqx_web_hook.appup.src
+++ b/apps/emqx_web_hook/src/emqx_web_hook.appup.src
@@ -1,7 +1,9 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.3.15",
+  [{"4.3.16",
+    [{load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
+   {"4.3.15",
     [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.14",
@@ -32,7 +34,9 @@
     [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.15",
+  [{"4.3.16",
+    [{load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
+   {"4.3.15",
     [{load_module,emqx_web_hook_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_web_hook_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.14",
diff --git a/changes/v4.4.15-en.md b/changes/v4.4.15-en.md
index 881e73ea6..e97cdf586 100644
--- a/changes/v4.4.15-en.md
+++ b/changes/v4.4.15-en.md
@@ -51,3 +51,5 @@
 - fix the `{badarg,[{ets,lookup,[gproc,{shared, ...` error logs during shutdown [#9919](https://github.com/emqx/emqx/pull/9919).
 
 - Fix crash when updating a client's keepalive via the HTTP API if it connects with keepalive disabled [#9933](https://github.com/emqx/emqx/pull/9933).
+
+- Delete the files directory when `resources` were deleted to avoid files leaking [#10039](https://github.com/emqx/emqx/pull/10039).
diff --git a/changes/v4.4.15-zh.md b/changes/v4.4.15-zh.md
index 73c681706..20c2645b6 100644
--- a/changes/v4.4.15-zh.md
+++ b/changes/v4.4.15-zh.md
@@ -52,3 +52,5 @@
 - 修复停止 EMQX 的时候，日志出现 `{badarg,[{ets,lookup,[gproc,{shared, ...` 错误的问题 [#9919](https://github.com/emqx/emqx/pull/9919)。
 
 - 修复当客户端连接禁用 keepalive 时, 通过 HTTP API 更新其 keepalive 会崩溃的问题 [#9933](https://github.com/emqx/emqx/pull/9933)。
+
+- 在 `资源` 删除时清理其文件目录以防止文件泄露 [#10039](https://github.com/emqx/emqx/pull/10039)。