Merge pull request #3918 from esl/update-deps

Update dependencies

big_tests/rebar.config

@@ -10,16 +10,16 @@
 {deps, [
         {lager, "3.9.2"},
         {base16, "2.0.1"},
-        {exml, "3.2.1", {pkg, hexml}},
-        {bbmustache, "1.10.0"},
+        {exml, "3.3.3", {pkg, hexml}},
+        {bbmustache, "1.12.2"},
         {jiffy, "1.1.1"},
         {proper, "1.4.0"},
         {gun, "2.0.0-rc.2"},
         {fusco, "0.1.1"},
         {escalus, "4.2.9"},
         {cowboy, "2.9.0"},
         {csv, "3.0.3", {pkg, csve}},
-        {amqp_client, "3.9.5"},
-        {esip, "1.0.43"},
+        {amqp_client, "3.11.6"},
+        {esip, "1.0.48"},
         {jid, "2.0.0", {pkg, mongoose_jid}}
 ]}.

big_tests/rebar.lock

@@ -1,16 +1,16 @@
 {"1.2.0",
-[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.5">>},0},
+[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.11.6">>},0},
  {<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},0},
- {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0},
+ {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0},
  {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1},
  {<<"credentials_obfuscation">>,
-  {pkg,<<"credentials_obfuscation">>,<<"2.4.0">>},
+  {pkg,<<"credentials_obfuscation">>,<<"3.2.0">>},
   2},
  {<<"csv">>,{pkg,<<"csve">>,<<"3.0.3">>},0},
  {<<"escalus">>,{pkg,<<"escalus">>,<<"4.2.9">>},0},
- {<<"esip">>,{pkg,<<"esip">>,<<"1.0.43">>},0},
- {<<"exml">>,{pkg,<<"hexml">>,<<"3.2.1">>},0},
+ {<<"esip">>,{pkg,<<"esip">>,<<"1.0.48">>},0},
+ {<<"exml">>,{pkg,<<"hexml">>,<<"3.3.3">>},0},
  {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.3">>},2},
  {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.4.4">>},1},
  {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.16">>},1},
@@ -19,31 +19,31 @@
  {<<"gun">>,{pkg,<<"gun">>,<<"2.0.0-rc.2">>},0},
  {<<"jid">>,{pkg,<<"mongoose_jid">>,<<"2.0.0">>},0},
  {<<"jiffy">>,{pkg,<<"jiffy">>,<<"1.1.1">>},0},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},2},
  {<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0},
  {<<"meck">>,{pkg,<<"meck">>,<<"0.9.2">>},1},
- {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.23">>},1},
+ {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.25">>},1},
  {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.5">>},2},
- {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.5">>},1},
+ {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.11.6">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
- {<<"recon">>,{pkg,<<"recon">>,<<"2.5.1">>},2},
+ {<<"recon">>,{pkg,<<"recon">>,<<"2.5.3">>},2},
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.27">>},1},
- {<<"stun">>,{pkg,<<"stun">>,<<"1.0.44">>},1},
+ {<<"stun">>,{pkg,<<"stun">>,<<"1.2.6">>},1},
+ {<<"thoas">>,{pkg,<<"thoas">>,<<"0.4.0">>},2},
  {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.5">>},1},
  {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.0.1">>},1}]}.
 [
 {pkg_hash,[
- {<<"amqp_client">>, <<"BE7B022550F1C0DDFB23A3145FC3D59B5EDB9FDFCC1DD705796C97F77E9EAC98">>},
+ {<<"amqp_client">>, <<"DB2C61408276A08C35C3C05C0B7309E2F25BF8F8E30612B7F45794961859592F">>},
  {<<"base16">>, <<"F0549F732E03BE8124ED0D19FD5EE52146CC8BE24C48CBC3F23AB44B157F11A2">>},
- {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>},
+ {<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
  {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
  {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
- {<<"credentials_obfuscation">>, <<"9FB57683B84899CA3546B384E59AB5D3054A9F334EBA50D74C82CD0AE82DD6CA">>},
+ {<<"credentials_obfuscation">>, <<"BECF48ED7C96938600F88F486031BCBF9B9C4E3353CC314CA131C347C4C7815C">>},
  {<<"csv">>, <<"69E7D9B3FDC72016644368762C6A3E6CBFEB85BCCADBF1BD99AB6C827E360E04">>},
  {<<"escalus">>, <<"061AA2731E91F592A1784E78117EC3CDD8DBFD4053ECE1C5EF1FC38D0FB5CDA1">>},
- {<<"esip">>, <<"1CBDC073073F80B9B50E2759F66CA13A353EB4F874BCF92501BD4CD767E34D46">>},
- {<<"exml">>, <<"2B5E288658C92ACD4791E95838422CC70B51FD4AAC48355B4CF3E780404E6A7B">>},
+ {<<"esip">>, <<"3B3B3AFC798BE9458517D4FD2730674322368E54C2C1211AA630327354946D1B">>},
+ {<<"exml">>, <<"C64FE46373886FD62F3F753D8031034E231DC0C138F9CD3539F738EF220F0960">>},
  {<<"fast_pbkdf2">>, <<"4F09D6C6C20DBEE1970E0A6AE91432E1B7731F88426C671D083BAC31FFA1FDAD">>},
  {<<"fast_scram">>, <<"299A2D430955A62A94CB43B1A727C5D21A5C4BD11AEBA476AE2F3A24CFBE89C3">>},
  {<<"fast_tls">>, <<"85FA7F3112EA4FF5CCB4F3ABADC130A8C855AD74EB00869487399CB0C322D208">>},
@@ -52,30 +52,30 @@
  {<<"gun">>, <<"7C489A32DEDCCB77B6E82D1F3C5A7DADFBFA004EC14E322CDB5E579C438632D2">>},
  {<<"jid">>, <<"0D0FD1130EAD05DF672D1C9E0405D3000F0C87A7D446577755CF5EB173104FE9">>},
  {<<"jiffy">>, <<"ACA10F47AA91697BF24AB9582C74E00E8E95474C7EF9F76D4F1A338D0F5DE21B">>},
- {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
  {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
  {<<"meck">>, <<"85CCBAB053F1DB86C7CA240E9FC718170EE5BDA03810A6292B5306BF31BAE5F5">>},
- {<<"p1_utils">>, <<"7F94466ADA69BD982EA7BB80FBCA18E7053E7D0B82C9D9E37621FA508587069B">>},
+ {<<"p1_utils">>, <<"2D39B5015A567BBD2CC7033EEB93A7C60D8C84EFE1EF69A3473FAA07FA268187">>},
  {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
  {<<"quickrand">>, <<"06FCAD85CB47D5C85C51D6BC9C84A082501BA098A89D64AD0A2F69599E034C04">>},
- {<<"rabbit_common">>, <<"4F94E901782DB08D2E944BEA8D8537010F724D1E37D7948661E48B887728C2A3">>},
+ {<<"rabbit_common">>, <<"2FF756A961212BCC85BBFFAE502123B6F0A82B464B988C10A60E811817C798A4">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
- {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>},
+ {<<"recon">>, <<"739107B9050EA683C30E96DE050BC59248FD27EC147696F79A8797FF9FA17153">>},
  {<<"stringprep">>, <<"02808C7024BC6285CA6A8A67E7ADDFC16F35DDA55551A582C5181D8EA960E890">>},
- {<<"stun">>, <<"30B6B774864B24B05BA901291ABE583BFF19081E7C4EFB3361DF50B781EC9D3B">>},
+ {<<"stun">>, <<"5D1978D340EA20EFB28BC1E58779A3A1D64568C66168DB4D20692E76CE813D5E">>},
+ {<<"thoas">>, <<"86A72CCDC5EC388A13F9F843BCD6C1076640233B95440E47FFB8E3C0DBDB5A17">>},
  {<<"uuid">>, <<"60FAEEB7EDFD40847ED13CB0DD1044BAABE4E79A00C0CA9C4D13A073914B1016">>},
  {<<"worker_pool">>, <<"CA262C2DFB3B4AF661B206C82065D86F83922B7227508AA6E0BC34D3E5AE5135">>}]},
 {pkg_hash_ext,[
- {<<"amqp_client">>, <<"DC7CD4D35B4AFF28620F7CD58A9B8F394DAD93CF896704B1F770554F5FF20FDE">>},
+ {<<"amqp_client">>, <<"5D81AA7B6900B9E60B7F3B2EE5C0F6E4C4AF9A2250FA7ECD78EC2DE8AA08477A">>},
  {<<"base16">>, <<"06EA2D48343282E712160BA89F692B471DB8B36ABE8394F3445FF9032251D772">>},
- {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>},
+ {<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
  {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
  {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
- {<<"credentials_obfuscation">>, <<"D28A89830E30698B075DE9A4DBE683A20685C6BED1E3B7DF744A0C06E6FF200A">>},
+ {<<"credentials_obfuscation">>, <<"FE8ECE91A1BA6C8A08EB1063CFD5B063A723C5FE29A1FAD6B7CBD76CB18D2EEB">>},
  {<<"csv">>, <<"741D1A55AABADAA3E0FE13051050101A73E90C4570B9F9403A939D9546813521">>},
  {<<"escalus">>, <<"036951195081C3315561D6A06A02CDC8717911282704BEA062459276335DDDC4">>},
- {<<"esip">>, <<"B2C758AE52C4588E0399C0B4CE550BFA56551A5A2F828A28389F2614797E4F4B">>},
- {<<"exml">>, <<"CC63B8A0CD96C1CA20B5F0C0CCCA75DED99D681385896A10E3BC848423D0AAC9">>},
+ {<<"esip">>, <<"02B9FC6E071415CBC62105F5115AEB68D11184BDAD3960DA7B62EA3E99E7FCCF">>},
+ {<<"exml">>, <<"CB54BF62E2902B52FE9CAF7E65176E764E8A10CCC51DE2DEDC0FC5C8D9F91AC6">>},
  {<<"fast_pbkdf2">>, <<"2900431E2E6402F23A92754448BBD949DA366BC9C984FDC791DDCFCC41042434">>},
  {<<"fast_scram">>, <<"4B30084E3BDB39158076381FC871035BEFD157D5EE614BDA5E19EA482855E5D5">>},
  {<<"fast_tls">>, <<"AA08CCA89B4044E74F1F12E399817D8BEAEAE3EE006C98A893C0BFB1D81FBA51">>},
@@ -84,17 +84,17 @@
  {<<"gun">>, <<"6B9D1EAE146410D727140DBF8B404B9631302ECC2066D1D12F22097AD7D254FC">>},
  {<<"jid">>, <<"7BAE8403552D5BCECD1CD2A848445B5FC3533F5EEB355173A0531A1A1AA8E008">>},
  {<<"jiffy">>, <<"62E1F0581C3C19C33A725C781DFA88410D8BFF1BBAFC3885A2552286B4785C4C">>},
- {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
  {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
  {<<"meck">>, <<"81344F561357DC40A8344AFA53767C32669153355B626EA9FCBC8DA6B3045826">>},
- {<<"p1_utils">>, <<"47F21618694EEEE5006AF1C88731AD86B757161E7823C29B6F73921B571C8502">>},
+ {<<"p1_utils">>, <<"9219214428F2C6E5D3187FF8EB9A8783695C2427420BE9A259840E07ADA32847">>},
  {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
  {<<"quickrand">>, <<"252CF0493570EBF1A58985CB71990982CDDCD4396B6427F1E10CF58924C1C052">>},
- {<<"rabbit_common">>, <<"D4F238DF7C2DC67ECECCD1E8A70EAFCC15FDB69DB1E82820533DBE92A229655A">>},
+ {<<"rabbit_common">>, <<"9C04068470FFC5FCE988186295EBCD7970996746CECE4AAA30585F97DCD8EE11">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
- {<<"recon">>, <<"5721C6B6D50122D8F68CCCAC712CAA1231F97894BAB779EFF5FF0F886CB44648">>},
+ {<<"recon">>, <<"6C6683F46FD4A1DFD98404B9F78DCABC7FCD8826613A89DCB984727A8C3099D7">>},
  {<<"stringprep">>, <<"A5967B1144CA8002A58A03D16DD109FBD0BCDB82616CEAD2F983944314AF6A00">>},
- {<<"stun">>, <<"E45BBA816CBEFFF01D820E49E66814F450DF25A7A468A70D68D1E64218D46520">>},
+ {<<"stun">>, <<"21AED098457E5099E925129459590592E001C470CF7503E5614A7A6B688FF146">>},
+ {<<"thoas">>, <<"442296847ACA11DB8D25180693D7CA3073D6D7179F66952F07B16415306513B6">>},
  {<<"uuid">>, <<"E54373262CA88401689277947C54B95E9ECBC977BD5C57C9DD44AD9DA278E360">>},
  {<<"worker_pool">>, <<"772E12CCB26909EA7F804B52E86E733DF66BB8150F683B591B0A762196494C74">>}]}
 ].

big_tests/run_common_test.erl

@@ -323,6 +323,7 @@ read_vars(File) ->
 %% bbmustache tries to iterate over lists, so we need to make them binaries
 ensure_binary_strings(Vars) ->
     maps:map(fun(dbs, V) -> V;
+                (_K, []) -> <<"\n">>; % empty binary is considered falsey in conditions
                 (_K, V) when is_list(V) -> list_to_binary(V);
                 (_K, V) -> V
               end, Vars).

big_tests/tests/ejabberd_node_utils.erl

@@ -186,6 +186,7 @@ template_config(Template, Vars) ->
 %% bbmustache tries to iterate over lists, so we need to make them binaries
 ensure_binary_strings(Vars) ->
     maps:map(fun(dbs, V) -> V;
+                (_K, []) -> <<"\n">>; % empty binary is considered falsey in conditions
                 (_K, V) when is_list(V) -> list_to_binary(V);
                 (_K, V) -> V
               end, Vars).

big_tests/tests/graphql_account_SUITE.erl

@@ -92,6 +92,7 @@ init_per_suite(Config) ->
     dynamic_modules:save_modules(domain_helper:host_type(), Config3).
 
 end_per_suite(Config) ->
+    file:delete(filename:join(?config(mim_data_dir, Config), "users.csv.tmp")),
     dynamic_modules:restore_modules(Config),
     escalus:end_per_suite(Config).
 

rebar.config

@@ -53,15 +53,15 @@
  [
   %%% Stateless parsers
   {base16, "2.0.1"},
-  {exml, "3.2.2", {pkg, hexml}},
+  {exml, "3.3.3", {pkg, hexml}},
   {jiffy, "1.1.1"},
   {jid, "2.0.0", {pkg, mongoose_jid}},
   {tomerl, "0.5.0"},
   {bbmustache, "1.12.2"},
   {erl_csv, "0.3.1"},
 
   %%% Observability
-  {telemetry, "1.0.0"},
+  {telemetry, "1.2.0"},
   {lager, "3.9.2"}, % We're keeping this to override the dependencies
   {exometer_core, {git, "https://github.com/esl/exometer_core.git", {branch, "master"}}},
   {exometer_report_graphite, {git, "https://github.com/esl/exometer_report_graphite.git", {branch, "master"}}},
@@ -70,47 +70,46 @@
   {flatlog, "0.1.2"},
 
   %%% Stateless libraries
-  {fast_tls, "1.1.13"},
+  {fast_tls, "1.1.16"},
   {fast_scram, "0.4.4"},
   {idna, "6.1.1"},
-  {uuid, "2.0.4", {pkg, uuid_erl}},
+  {uuid, "2.0.5", {pkg, uuid_erl}},
   {gen_fsm_compat, "0.3.0"},
 
   %%% Stateful apps
-  {cache_tab, "1.0.29"},
+  {cache_tab, "1.0.30"},
   {segmented_cache, "0.2.0"},
   {worker_pool, "6.0.1"},
 
   %%% HTTP tools
   {graphql, {git, "https://github.com/esl/graphql-erlang.git", {branch, "master"}}},
   {ranch, "2.1.0"},
   {cowboy, "2.9.0"},
+  {hackney, "1.18.1"},
   {gun, "1.3.3"},
   {fusco, "0.1.1"},
   {lasse, "1.2.0"},
   {trails, "2.3.0"},
-  {cowboy_swagger, "2.5.0"},
+  {cowboy_swagger, "2.5.1"},
 
   %%% Outgoing pools
-  %% We use a git repo here, because HEX packet pulls riak_pb version
-  %% that recompiles its files on each run of "rebar3 compile" (which slows down development)
-  {riakc, {git, "https://github.com/basho/riak-erlang-client.git", {branch, "2.5.3"}}},
+  {riakc, "2.5.3"},
   {cqerl, {git, "https://github.com/esl/cqerl.git", {branch, "master"}}},
   {mysql, "1.8.0"},
-  {epgsql, "4.6.0"},
+  {epgsql, "4.7.0"},
   {eodbc, "0.1.0"},
-  {tirerl, "1.1.0"},
-  {amqp_client, "3.9.11"},
-  {eredis, "1.2.0"},
-  {erlcloud, "3.5.11"},
+  {tirerl, "1.2.0"},
+  {amqp_client, "3.11.6"},
+  {eredis, "1.7.0"},
+  {erlcloud, "3.6.5"},
 
   %%% Internal monitoring and debugging tools
-  {recon, "2.5.2"},
-  {observer_cli, "1.7.1"},
+  {recon, "2.5.3"},
+  {observer_cli, "1.7.4"},
 
   %%% Testing deps
   {proper, "1.4.0"},
-  {meck, "0.8.13"},
+  {meck, "0.9.2"},
 
   %%% Other
   {pa, {git, "https://github.com/erszcz/pa.git", {branch, "master"}}},
@@ -187,7 +186,7 @@
   {pc, "1.14.0"},
   {provider_asn1, "0.3.0"},
   {rebar3_codecov, "0.3.0"},
-  {rebar3_lint, "1.0.1"}
+  {rebar3_lint, "2.0.1"}
  ]}.
 
 {provider_hooks,