packaging/standalone: Take broker dependencies into account

While here, use the new rabbit_plugins:list/2 API to remove the
hard-coded list of broker direct dependencies.

1 files changed, 9 insertions, 5 deletions

diff --git a/packaging/standalone/src/rabbit_release.erl b/packaging/standalone/src/rabbit_release.erl
index 4e16fd52b5..9eed1a59fa 100644
--- a/packaging/standalone/src/rabbit_release.erl
+++ b/packaging/standalone/src/rabbit_release.erl
@@ -40,8 +40,8 @@ start() ->
     %% add the plugin ebin folder to the code path.
     add_plugins_to_path(UnpackedPluginDir),
 
-    PluginAppNames = [rabbit_common | [P#plugin.name ||
-                         P <- rabbit_plugins:list(PluginsDistDir)]],
+    PluginAppNames = [P#plugin.name ||
+                      P <- rabbit_plugins:list(PluginsDistDir, false)],
 
     %% Build the entire set of dependencies - this will load the
     %% applications along the way
@@ -54,11 +54,15 @@ start() ->
               end,
 
     %% we need a list of ERTS apps we need to ship with rabbit
+    RabbitMQAppNames = [rabbit | [P#plugin.name ||
+                        P <- rabbit_plugins:list(PluginsDistDir, true)]]
+                       -- PluginAppNames,
     {ok, SslAppsConfig} = application:get_env(rabbit, ssl_apps),
 
-    BaseApps = lists:umerge(
+    BaseApps = lists:umerge([
+      lists:sort(RabbitMQAppNames),
       lists:sort(SslAppsConfig),
-      lists:sort(AllApps -- PluginAppNames)),
+      lists:sort(AllApps -- PluginAppNames)]),
 
     AppVersions = [determine_version(App) || App <- BaseApps],
     RabbitVersion = proplists:get_value(rabbit, AppVersions),
@@ -111,7 +115,7 @@ prepare_plugins(PluginsDistDir, DestDir) ->
     end,
 
     [prepare_plugin(Plugin, DestDir) ||
-        Plugin <- rabbit_plugins:list(PluginsDistDir)].
+        Plugin <- rabbit_plugins:list(PluginsDistDir, true)].
 
 prepare_plugin(#plugin{type = ez, location = Location}, PluginDestDir) ->
     zip:unzip(Location, [{cwd, PluginDestDir}]);