yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ft-s3): fix dependency dependencies

This commit is contained in:
Ilya Averyanov 2023-04-04 14:19:58 +03:00
parent 4fbabe5a76
commit c7865e5eae
4 changed files with 96 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_s3/rebar.config
View File

@ -1,6 +1,6 @@
{deps, [ {deps, [
{emqx, {path, "../../apps/emqx"}}, {emqx, {path, "../../apps/emqx"}},
{erlcloud, {git, "https://github.com/savonarola/erlcloud", {tag, "3.6.7-emqx-1"}}} {erlcloud, {git, "https://github.com/emqx/erlcloud", {tag, "3.6.7-emqx-1"}}}
]}. ]}.
{project_plugins, [erlfmt]}. {project_plugins, [erlfmt]}.

2
lib-ee/emqx_ee_connector/rebar.config
View File

@ -4,7 +4,7 @@
{influxdb, {git, "https://github.com/emqx/influxdb-client-erl", {tag, "1.1.9"}}}, {influxdb, {git, "https://github.com/emqx/influxdb-client-erl", {tag, "1.1.9"}}},
{tdengine, {git, "https://github.com/emqx/tdengine-client-erl", {tag, "0.1.6"}}}, {tdengine, {git, "https://github.com/emqx/tdengine-client-erl", {tag, "0.1.6"}}},
{clickhouse, {git, "https://github.com/emqx/clickhouse-client-erl", {tag, "0.3"}}}, {clickhouse, {git, "https://github.com/emqx/clickhouse-client-erl", {tag, "0.3"}}},
{erlcloud, {git, "https://github.com/emqx/erlcloud.git", {tag, "3.6.7-emqx-1"}}}, {erlcloud, {git, "https://github.com/emqx/erlcloud", {tag, "3.6.7-emqx-1"}}},
{rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.1"}}}, {rocketmq, {git, "https://github.com/emqx/rocketmq-client-erl.git", {tag, "v0.5.1"}}},
{emqx, {path, "../../apps/emqx"}} {emqx, {path, "../../apps/emqx"}}
]}. ]}.

9
mix.exs
View File

@ -93,7 +93,14 @@ defmodule EMQXUmbrella.MixProject do
github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true}, github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true},
# in conflict by grpc and eetcd # in conflict by grpc and eetcd
{:gpb, "4.19.5", override: true, runtime: false}, {:gpb, "4.19.5", override: true, runtime: false},
{:hackney, github: "emqx/hackney", tag: "1.18.1-1", override: true} {:hackney, github: "emqx/hackney", tag: "1.18.1-1", override: true},
{:erlcloud, github: "emqx/erlcloud", tag: "3.6.7-emqx-1", override: true},
# erlcloud's rebar.config requires rebar3 and does not support Mix,
# so it tries to fetch deps from git. We need to override this.
{:lhttpc, "1.6.2", override: true},
{:eini, "1.2.9", override: true},
{:base16, "1.0.0", override: true}
# end of erlcloud's deps
] ++ ] ++
emqx_apps(profile_info, version) ++ emqx_apps(profile_info, version) ++
enterprise_deps(profile_info) ++ bcrypt_dep() ++ jq_dep() ++ quicer_dep() enterprise_deps(profile_info) ++ bcrypt_dep() ++ jq_dep() ++ quicer_dep()

157
rebar.config
View File

@ -7,24 +7,35 @@
%% with rebar.config.erl module. Final result is written to %% with rebar.config.erl module. Final result is written to
%% rebar.config.rendered if environment DEBUG is set. %% rebar.config.rendered if environment DEBUG is set.
{edoc_opts, [{preprocess,true}]}. {edoc_opts, [{preprocess, true}]}.
{erl_opts, [warn_unused_vars,warn_shadow_vars,warn_unused_import, {erl_opts, [
warn_obsolete_guard,compressed, nowarn_unused_import, warn_unused_vars,
{d, snk_kind, msg} warn_shadow_vars,
]}. warn_unused_import,
warn_obsolete_guard,
compressed,
nowarn_unused_import,
{d, snk_kind, msg}
]}.
{xref_checks,[undefined_function_calls,undefined_functions,locals_not_used, {xref_checks, [
deprecated_function_calls,warnings_as_errors,deprecated_functions]}. undefined_function_calls,
undefined_functions,
locals_not_used,
deprecated_function_calls,
warnings_as_errors,
deprecated_functions
]}.
%% Check the forbidden mnesia calls: %% Check the forbidden mnesia calls:
{xref_queries, {xref_queries, [
[ {"E || \"mnesia\":\"dirty_delete.*\"/\".*\" : Fun", []} {"E || \"mnesia\":\"dirty_delete.*\"/\".*\" : Fun", []},
, {"E || \"mnesia\":\"transaction\"/\".*\" : Fun", []} {"E || \"mnesia\":\"transaction\"/\".*\" : Fun", []},
, {"E || \"mnesia\":\"async_dirty\"/\".*\" : Fun", []} {"E || \"mnesia\":\"async_dirty\"/\".*\" : Fun", []},
, {"E || \"mnesia\":\"clear_table\"/\".*\" : Fun", []} {"E || \"mnesia\":\"clear_table\"/\".*\" : Fun", []},
, {"E || \"mnesia\":\"create_table\"/\".*\" : Fun", []} {"E || \"mnesia\":\"create_table\"/\".*\" : Fun", []},
, {"E || \"mnesia\":\"delete_table\"/\".*\" : Fun", []} {"E || \"mnesia\":\"delete_table\"/\".*\" : Fun", []}
]}. ]}.
{dialyzer, [ {dialyzer, [
{warnings, [unmatched_returns, error_handling]}, {warnings, [unmatched_returns, error_handling]},
@ -32,72 +43,76 @@
{plt_prefix, "emqx_dialyzer"}, {plt_prefix, "emqx_dialyzer"},
{plt_apps, all_apps}, {plt_apps, all_apps},
{statistics, true} {statistics, true}
] ]}.
}.
{cover_opts, [verbose]}. {cover_opts, [verbose]}.
{cover_export_enabled, true}. {cover_export_enabled, true}.
{cover_excl_mods, {cover_excl_mods,
[ %% generated protobuf modules %% generated protobuf modules
emqx_exproto_pb, [
emqx_exhook_pb, emqx_exproto_pb,
%% taken almost as-is from OTP emqx_exhook_pb,
emqx_ssl_crl_cache %% taken almost as-is from OTP
]}. emqx_ssl_crl_cache
]}.
{provider_hooks, [{pre, [{release, {relup_helper, gen_appups}}]}]}. {provider_hooks, [{pre, [{release, {relup_helper, gen_appups}}]}]}.
{post_hooks,[]}. {post_hooks, []}.
{deps, {deps, [
[ {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.2"}}} {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.2"}}},
, {redbug, "2.0.8"} {redbug, "2.0.8"},
, {covertool, {git, "https://github.com/zmstone/covertool", {tag, "2.0.4.1"}}} {covertool, {git, "https://github.com/zmstone/covertool", {tag, "2.0.4.1"}}},
, {gpb, "4.19.5"} %% gpb only used to build, but not for release, pin it here to avoid fetching a wrong version due to rebar plugins scattered in all the deps %% gpb only used to build, but not for release, pin it here to avoid fetching a wrong version due to rebar plugins scattered in all the deps
, {typerefl, {git, "https://github.com/ieQu1/typerefl", {tag, "0.9.1"}}} {gpb, "4.19.5"},
, {gun, {git, "https://github.com/emqx/gun", {tag, "1.3.9"}}} {typerefl, {git, "https://github.com/ieQu1/typerefl", {tag, "0.9.1"}}},
, {ehttpc, {git, "https://github.com/emqx/ehttpc", {tag, "0.4.7"}}} {gun, {git, "https://github.com/emqx/gun", {tag, "1.3.9"}}},
, {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}} {ehttpc, {git, "https://github.com/emqx/ehttpc", {tag, "0.4.7"}}},
, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}} {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}},
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}} {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}},
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}} {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}},
, {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}} {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.6"}}} {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}},
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}} {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.6"}}},
, {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.7"}}} {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
, {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.3"}}} {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.7"}}},
, {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}} {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.3"}}},
, {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.9"}}} {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}},
, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}} {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.9"}}},
, {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.5"}}} {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
, {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.5"}}} {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.8.5"}}},
, {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.4"}}},
, {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}} % NOTE: depends on recon 2.5.x
, {getopt, "1.0.2"} {observer_cli, "1.7.1"},
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.7"}}} {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}},
, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.38.0"}}} {getopt, "1.0.2"},
, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}} {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.7"}}},
, {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}} {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.38.0"}}},
, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}} {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
, {telemetry, "1.1.0"} {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}},
, {hackney, {git, "https://github.com/emqx/hackney.git", {tag, "1.18.1-1"}}} {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}},
]}. {telemetry, "1.1.0"},
{hackney, {git, "https://github.com/emqx/hackney.git", {tag, "1.18.1-1"}}}
]}.
{xref_ignores, {xref_ignores,
[ %% schema registry is for enterprise %% schema registry is for enterprise
{emqx_schema_registry,get_all_schemas,0}, [
{emqx_schema_api,format_schema,1}, {emqx_schema_registry, get_all_schemas, 0},
{emqx_schema_api,make_schema_params,1}, {emqx_schema_api, format_schema, 1},
{emqx_schema_parser,decode,3}, {emqx_schema_api, make_schema_params, 1},
{emqx_schema_parser,encode,3}, {emqx_schema_parser, decode, 3},
{emqx_schema_registry,add_schema,1}, {emqx_schema_parser, encode, 3},
emqx_exhook_pb, % generated code for protobuf {emqx_schema_registry, add_schema, 1},
emqx_exproto_pb % generated code for protobuf % generated code for protobuf
]}. emqx_exhook_pb,
% generated code for protobuf
emqx_exproto_pb
]}.
{project_plugins, {project_plugins, [
[ erlfmt, erlfmt,
{rebar3_hex, "7.0.2"}, {rebar3_hex, "7.0.2"},
{rebar3_sbom, {rebar3_sbom, {git, "https://github.com/emqx/rebar3_sbom.git", {tag, "v0.6.1-1"}}}
{git, "https://github.com/emqx/rebar3_sbom.git", {tag, "v0.6.1-1"}}}
]}. ]}.