fix: bad rebase conflict resolution

apps/emqx_bridge_azure_blob_storage/mix.exs

@@ -1,34 +0,0 @@
-defmodule EMQXBridgeAzureBlobStorage.MixProject do
-  use Mix.Project
-  alias EMQXUmbrella.MixProject, as: UMP
-
-  def project do
-    [
-      app: :emqx_bridge_azure_blob_storage,
-      version: "0.1.0",
-      build_path: "../../_build",
-      erlc_options: UMP.erlc_options(),
-      erlc_paths: UMP.erlc_paths(),
-      deps_path: "../../deps",
-      lockfile: "../../mix.lock",
-      elixir: "~> 1.14",
-      start_permanent: Mix.env() == :prod,
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [
-      extra_applications: UMP.extra_applications(),
-      mod: {:emqx_bridge_azure_blob_storage_app, []}
-    ]
-  end
-
-  def deps() do
-    [
-      {:emqx_resource, in_umbrella: true},
-      {:emqx_connector_aggregator, in_umbrella: true},
-      {:erlazure, github: "emqx/erlazure", tag: "0.4.0.0"}
-    ]
-  end
-end

apps/emqx_cluster_link/mix.exs

@@ -1,32 +0,0 @@
-defmodule EMQXClusterLink.MixProject do
-  use Mix.Project
-  alias EMQXUmbrella.MixProject, as: UMP
-
-  def project do
-    [
-      app: :emqx_cluster_link,
-      version: "0.1.0",
-      build_path: "../../_build",
-      erlc_options: UMP.erlc_options(),
-      erlc_paths: UMP.erlc_paths(),
-      deps_path: "../../deps",
-      lockfile: "../../mix.lock",
-      elixir: "~> 1.14",
-      start_permanent: Mix.env() == :prod,
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [extra_applications: UMP.extra_applications(), mod: {:emqx_cluster_link_app, []}]
-  end
-
-  def deps() do
-    [
-      {:emqx, in_umbrella: true},
-      {:emqx_resource, in_umbrella: true},
-      {:emqtt,
-       github: "emqx/emqtt", tag: "1.10.1", override: true, system_env: UMP.maybe_no_quic_env()}
-    ]
-  end
-end

apps/emqx_ds_backends/mix.exs

@@ -1,36 +0,0 @@
-defmodule EMQXDsBackends.MixProject do
-  use Mix.Project
-  alias EMQXUmbrella.MixProject, as: UMP
-
-  def project do
-    [
-      app: :emqx_ds_backends,
-      version: "0.1.0",
-      build_path: "../../_build",
-      erlc_options: UMP.erlc_options(),
-      erlc_paths: UMP.erlc_paths(),
-      deps_path: "../../deps",
-      lockfile: "../../mix.lock",
-      elixir: "~> 1.14",
-      start_permanent: Mix.env() == :prod,
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [extra_applications: UMP.extra_applications()]
-  end
-
-  def deps() do
-    %{edition_type: edition_type} = UMP.profile_info()
-    ee_deps = if edition_type == :enterprise,
-      do: [{:emqx_ds_builtin_raft, in_umbrella: true}],
-      else: []
-
-    ee_deps ++ [
-      {:emqx_utils, in_umbrella: true},
-      {:emqx_durable_storage, in_umbrella: true},
-      {:emqx_ds_builtin_local, in_umbrella: true},
-    ]
-  end
-end

apps/emqx_ds_builtin_local/mix.exs

@@ -1,33 +0,0 @@
-defmodule EMQXDsBuiltinLocal.MixProject do
-  use Mix.Project
-  alias EMQXUmbrella.MixProject, as: UMP
-
-  def project do
-    [
-      app: :emqx_ds_builtin_local,
-      version: "0.1.0",
-      build_path: "../../_build",
-      erlc_options: UMP.erlc_options(),
-      erlc_paths: UMP.erlc_paths(),
-      deps_path: "../../deps",
-      lockfile: "../../mix.lock",
-      elixir: "~> 1.14",
-      start_permanent: Mix.env() == :prod,
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [
-      extra_applications: [:gproc, :mria, :rocksdb | UMP.extra_applications()],
-      mod: {:emqx_ds_builtin_local_app, []}
-    ]
-  end
-
-  def deps() do
-    [
-      {:emqx_utils, in_umbrella: true},
-      {:emqx_durable_storage, in_umbrella: true}
-    ]
-  end
-end

apps/emqx_ds_builtin_raft/mix.exs

@@ -1,27 +0,0 @@
-defmodule EMQXDsBuiltinRaft.MixProject do
-  use Mix.Project
-  alias EMQXUmbrella.MixProject, as: UMP
-
-  def project do
-    [
-      app: :emqx_ds_builtin_raft,
-      version: "0.1.0",
-      build_path: "../../_build",
-      erlc_options: UMP.erlc_options(),
-      erlc_paths: UMP.erlc_paths(),
-      deps_path: "../../deps",
-      lockfile: "../../mix.lock",
-      elixir: "~> 1.14",
-      start_permanent: Mix.env() == :prod,
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [extra_applications: UMP.extra_applications(), mod: {:emqx_ds_builtin_raft_app, []}]
-  end
-
-  def deps() do
-    [{:emqx_durable_storage, in_umbrella: true}, {:ra, "2.7.3"}]
-  end
-end

apps/emqx_ds_shared_sub/mix.exs

@@ -1,27 +0,0 @@
-defmodule EMQXDsSharedSub.MixProject do
-  use Mix.Project
-  alias EMQXUmbrella.MixProject, as: UMP
-
-  def project do
-    [
-      app: :emqx_ds_shared_sub,
-      version: "0.1.0",
-      build_path: "../../_build",
-      erlc_options: UMP.erlc_options(),
-      erlc_paths: UMP.erlc_paths(),
-      deps_path: "../../deps",
-      lockfile: "../../mix.lock",
-      elixir: "~> 1.14",
-      start_permanent: Mix.env() == :prod,
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [extra_applications: UMP.extra_applications(), mod: {:emqx_ds_shared_sub_app, []}]
-  end
-
-  def deps() do
-    [{:emqx, in_umbrella: true}]
-  end
-end

apps/emqx_schema_registry/test/emqx_schema_registry_SUITE.erl

@@ -47,12 +47,22 @@ sparkplug_tests() ->
     ].
 
 init_per_suite(Config) ->
-    emqx_config:save_schema_mod_and_names(emqx_schema_registry_schema),
-    emqx_mgmt_api_test_util:init_suite(?APPS),
-    Config.
+    Apps = emqx_cth_suite:start(
+        [
+            emqx,
+            emqx_conf,
+            emqx_rule_engine,
+            emqx_schema_registry,
+            emqx_management,
+            emqx_mgmt_api_test_util:emqx_dashboard()
+        ],
+        #{work_dir => emqx_cth_suite:work_dir(Config)}
+    ),
+    [{apps, Apps} | Config].
 
-end_per_suite(_Config) ->
-    emqx_mgmt_api_test_util:end_suite(lists:reverse(?APPS)),
+end_per_suite(Config) ->
+    Apps = ?config(apps, Config),
+    emqx_cth_suite:stop(Apps),
     ok.
 
 init_per_group(avro, Config) ->

apps/emqx_schema_registry/test/emqx_schema_registry_http_api_SUITE.erl

@@ -36,12 +36,22 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
-    emqx_config:save_schema_mod_and_names(emqx_schema_registry_schema),
-    emqx_mgmt_api_test_util:init_suite(?APPS),
-    Config.
+    Apps = emqx_cth_suite:start(
+        [
+            emqx,
+            emqx_conf,
+            emqx_rule_engine,
+            emqx_schema_registry,
+            emqx_management,
+            emqx_mgmt_api_test_util:emqx_dashboard()
+        ],
+        #{work_dir => emqx_cth_suite:work_dir(Config)}
+    ),
+    [{apps, Apps} | Config].
 
-end_per_suite(_Config) ->
-    emqx_mgmt_api_test_util:end_suite(lists:reverse(?APPS)),
+end_per_suite(Config) ->
+    Apps = ?config(apps, Config),
+    emqx_cth_suite:stop(Apps),
     ok.
 
 init_per_group(avro, Config) ->

mix.exs

@@ -215,7 +215,6 @@ defmodule EMQXUmbrella.MixProject do
       :emqx_license,
       :emqx_s3,
       :emqx_bridge_s3,
-      :emqx_bridge_azure_blob_storage,
       :emqx_schema_registry,
       :emqx_schema_validation,
       :emqx_message_transformation,
@@ -230,10 +229,7 @@ defmodule EMQXUmbrella.MixProject do
       :emqx_gateway_ocpp,
       :emqx_gateway_jt808,
       :emqx_bridge_syskeeper,
-      :emqx_ds_shared_sub,
-      :emqx_auth_ext,
-      :emqx_cluster_link,
-      :emqx_ds_builtin_raft
+      :emqx_auth_ext
     ])
   end