Merge pull request #11192 from zhongwencool/bump-hocon-to-0.39.13
chore: update hocon to 0.39.13
This commit is contained in:
commit
8b80a2f754
|
@ -29,7 +29,7 @@
|
|||
{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
|
||||
{ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.5"}}},
|
||||
{gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
|
||||
{hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.11"}}},
|
||||
{hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.13"}}},
|
||||
{emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
|
||||
{pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
|
||||
{recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},
|
||||
|
|
|
@ -35,7 +35,7 @@ reset_authorizers(Nomatch, CacheEnabled, Source) ->
|
|||
[authorization],
|
||||
#{
|
||||
<<"no_match">> => atom_to_binary(Nomatch),
|
||||
<<"cache">> => #{<<"enable">> => atom_to_binary(CacheEnabled)},
|
||||
<<"cache">> => #{<<"enable">> => CacheEnabled},
|
||||
<<"sources">> => Source
|
||||
}
|
||||
),
|
||||
|
|
Binary file not shown.
|
@ -114,7 +114,6 @@
|
|||
|
||||
%% boolean
|
||||
-define(START_AFTER_CREATED, true).
|
||||
-define(START_AFTER_CREATED_RAW, <<"true">>).
|
||||
|
||||
-define(TEST_ID_PREFIX, "_probe_:").
|
||||
-define(RES_METRICS, resource_metrics).
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
%% -*- mode: erlang -*-
|
||||
{application, emqx_resource, [
|
||||
{description, "Manager for all external resources"},
|
||||
{vsn, "0.1.19"},
|
||||
{vsn, "0.1.20"},
|
||||
{registered, []},
|
||||
{mod, {emqx_resource_app, []}},
|
||||
{applications, [
|
||||
|
|
|
@ -129,7 +129,7 @@ health_check_interval_range(HealthCheckInterval) ->
|
|||
|
||||
start_after_created(type) -> boolean();
|
||||
start_after_created(desc) -> ?DESC("start_after_created");
|
||||
start_after_created(default) -> ?START_AFTER_CREATED_RAW;
|
||||
start_after_created(default) -> ?START_AFTER_CREATED;
|
||||
start_after_created(required) -> false;
|
||||
start_after_created(_) -> undefined.
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Fixes crash when updating binding with a non-integer port.
|
|
@ -0,0 +1,2 @@
|
|||
Fix produces valid HOCON file when atom type is used.
|
||||
Remove unnecessary `"` from HOCON file.
|
2
mix.exs
2
mix.exs
|
@ -72,7 +72,7 @@ defmodule EMQXUmbrella.MixProject do
|
|||
# in conflict by emqtt and hocon
|
||||
{:getopt, "1.0.2", override: true},
|
||||
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.8", override: true},
|
||||
{:hocon, github: "emqx/hocon", tag: "0.39.11", override: true},
|
||||
{:hocon, github: "emqx/hocon", tag: "0.39.13", override: true},
|
||||
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.2", override: true},
|
||||
{:esasl, github: "emqx/esasl", tag: "0.2.0"},
|
||||
{:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
, {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}
|
||||
, {getopt, "1.0.2"}
|
||||
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.8"}}}
|
||||
, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.11"}}}
|
||||
, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.13"}}}
|
||||
, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}
|
||||
, {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
|
||||
, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}
|
||||
|
|
Loading…
Reference in New Issue