diff --git a/apps/emqx_ft/src/emqx_ft.app.src b/apps/emqx_ft/src/emqx_ft.app.src index 80b4b47dd..058fe984a 100644 --- a/apps/emqx_ft/src/emqx_ft.app.src +++ b/apps/emqx_ft/src/emqx_ft.app.src @@ -6,7 +6,8 @@ {applications, [ kernel, stdlib, - gproc + gproc, + emqx_s3 ]}, {env, []}, {modules, []} diff --git a/apps/emqx_machine/src/emqx_machine_boot.erl b/apps/emqx_machine/src/emqx_machine_boot.erl index feeb1ba75..83824db40 100644 --- a/apps/emqx_machine/src/emqx_machine_boot.erl +++ b/apps/emqx_machine/src/emqx_machine_boot.erl @@ -146,12 +146,17 @@ basic_reboot_apps() -> emqx_authz, emqx_slow_subs, emqx_auto_subscribe, - emqx_plugins, - emqx_s3 + emqx_plugins ], case emqx_release:edition() of - ce -> CE; - ee -> CE ++ [] + ce -> + CE; + ee -> + CE ++ + [ + emqx_s3, + emqx_ft + ] end. sorted_reboot_apps() -> diff --git a/mix.exs b/mix.exs index 9a8c22e6b..689253a76 100644 --- a/mix.exs +++ b/mix.exs @@ -293,7 +293,6 @@ defmodule EMQXUmbrella.MixProject do emqx_psk: :permanent, emqx_slow_subs: :permanent, emqx_plugins: :permanent, - emqx_ft: :permanent, emqx_mix: :none ] ++ if(enable_quicer?(), do: [quicer: :permanent], else: []) ++ @@ -308,7 +307,9 @@ defmodule EMQXUmbrella.MixProject do emqx_license: :permanent, emqx_ee_conf: :load, emqx_ee_connector: :permanent, - emqx_ee_bridge: :permanent + emqx_ee_bridge: :permanent, + emqx_s3: :permanent, + emqx_ft: :permanent ], else: [] ) diff --git a/rebar.config.erl b/rebar.config.erl index 51a6946dc..158f66cd6 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -400,9 +400,7 @@ relx_apps(ReleaseType, Edition) -> emqx_prometheus, emqx_psk, emqx_slow_subs, - emqx_plugins, - emqx_ft, - emqx_s3 + emqx_plugins ] ++ [quicer || is_quicer_supported()] ++ [bcrypt || provide_bcrypt_release(ReleaseType)] ++ @@ -424,7 +422,9 @@ relx_apps_per_edition(ee) -> emqx_license, {emqx_ee_conf, load}, emqx_ee_connector, - emqx_ee_bridge + emqx_ee_bridge, + emqx_s3, + emqx_ft ]; relx_apps_per_edition(ce) -> [].