Skip to content

Commit f5e3ed2

Browse files
chrzaszczchrzaszcz
authored
Merge pull request #4500 from esl/upgrade_deps
Upgrade deps
2 parents 5471403 + 3574982 commit f5e3ed2

File tree

8 files changed

+113
-187
lines changed

8 files changed

+113
-187
lines changed

‎big_tests/rebar.config

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
{gun, "2.1.0"},
1616
{fusco, "0.1.1"},
1717
{escalus, "4.5.1"},
18-
{cowboy, "2.12.0"},
18+
{ranch, "2.2.0"},
19+
{cowboy, "2.13.0"},
1920
{csv, "3.0.3", {pkg, csve}},
2021
{amqp_client, "4.0.3"},
2122
{rabbit_common, "4.0.3"},
22-
{esip, "1.0.56"},
23+
{esip, "1.0.57"},
2324
{jid, "2.2.0", {pkg, mongoose_jid}},
2425
{ct_groups_summary_hook, "0.1.1"},
2526
{wait_helper, "0.2.1"}
2627
]}.
28+
29+
%% See https://github.com/ninenines/cowboy/issues/1670
30+
{overrides, [{override, cowboy, [{deps, [{cowlib, "~> 2.0"}]}]}]}.

‎big_tests/rebar.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{"1.2.0",
22
[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"4.0.3">>},0},
33
{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
4-
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},0},
5-
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.13.0">>},1},
4+
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.13.0">>},0},
5+
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.14.0">>},1},
66
{<<"credentials_obfuscation">>,
77
{pkg,<<"credentials_obfuscation">>,<<"3.4.0">>},
88
1},
@@ -11,7 +11,7 @@
1111
{pkg,<<"ct_groups_summary_hook">>,<<"0.1.1">>},
1212
0},
1313
{<<"escalus">>,{pkg,<<"escalus">>,<<"4.5.1">>},0},
14-
{<<"esip">>,{pkg,<<"esip">>,<<"1.0.56">>},0},
14+
{<<"esip">>,{pkg,<<"esip">>,<<"1.0.57">>},0},
1515
{<<"exml">>,{pkg,<<"hexml">>,<<"4.1.2">>},0},
1616
{<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"2.0.0">>},2},
1717
{<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.7.0">>},1},
@@ -25,10 +25,10 @@
2525
{<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
2626
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},2},
2727
{<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"4.0.3">>},0},
28-
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
28+
{<<"ranch">>,{pkg,<<"ranch">>,<<"2.2.0">>},0},
2929
{<<"recon">>,{pkg,<<"recon">>,<<"2.5.6">>},1},
3030
{<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.29">>},1},
31-
{<<"stun">>,{pkg,<<"stun">>,<<"1.2.15">>},1},
31+
{<<"stun">>,{pkg,<<"stun">>,<<"1.2.17">>},1},
3232
{<<"thoas">>,{pkg,<<"thoas">>,<<"1.2.1">>},1},
3333
{<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},1},
3434
{<<"wait_helper">>,{pkg,<<"wait_helper">>,<<"0.2.1">>},0},
@@ -37,13 +37,13 @@
3737
{pkg_hash,[
3838
{<<"amqp_client">>, <<"C7DCC8031C780CD39EC586BA827A8EB26E006E9761AF8D3F58FDED11F645EBD4">>},
3939
{<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
40-
{<<"cowboy">>, <<"F276D521A1FF88B2B9B4C54D0E753DA6C66DD7BE6C9FCA3D9418B561828A3731">>},
41-
{<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>},
40+
{<<"cowboy">>, <<"09D770DD5F6A22CC60C071F432CD7CB87776164527F205C5A6B0F24FF6B38990">>},
41+
{<<"cowlib">>, <<"623791C56C1CC9DF54A71A9C55147A401549917F00A2E48A6AE12B812C586CED">>},
4242
{<<"credentials_obfuscation">>, <<"34E18B126B3AEFD6E8143776FBE1CECEEA6792307C99AC5EE8687911F048CFD7">>},
4343
{<<"csv">>, <<"69E7D9B3FDC72016644368762C6A3E6CBFEB85BCCADBF1BD99AB6C827E360E04">>},
4444
{<<"ct_groups_summary_hook">>, <<"21B94902B6CF2D345F4D790D34B49654E71CB8E570DCCC9C1C3616DAE720A7AA">>},
4545
{<<"escalus">>, <<"A79B93BC013219078C13C004766287CC97045D75A8BF893163B8FF7E5DD521CD">>},
46-
{<<"esip">>, <<"63C0FDC667BE751714E1E5C14621A9334F21B60AC1BB68BE889454CA9CA021B7">>},
46+
{<<"esip">>, <<"4B14E4832D08B9FFC10D855B5D10B3083232B1D53DEB4C046679496CE85569C4">>},
4747
{<<"exml">>, <<"4EA6B95AF18922F94FD67BBDEAA325A75CCE04487083C786E7417BA862D590E5">>},
4848
{<<"fast_pbkdf2">>, <<"72CDEE3C10C6B9B40E31194DE946A883CEEF6CF1F37D7FC9FD1A9D87502723F5">>},
4949
{<<"fast_scram">>, <<"FAD4DD185E0DEFA34B0E30654AB0CC4048E9324BCF65BB261E0A86BF3C604F9F">>},
@@ -57,24 +57,24 @@
5757
{<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
5858
{<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
5959
{<<"rabbit_common">>, <<"E927B882733D122F6802662220BDB1A83774852DBE67D21D4E33AAF54F3998DD">>},
60-
{<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
60+
{<<"ranch">>, <<"25528F82BC8D7C6152C57666CA99EC716510FE0925CB188172F41CE93117B1B0">>},
6161
{<<"recon">>, <<"9052588E83BFEDFD9B72E1034532AEE2A5369D9D9343B61AEB7FBCE761010741">>},
6262
{<<"stringprep">>, <<"02F23E8C3A219A3DFE40A22E908BECE3A2F68AF0FF599EA8A7B714ECB21E62EE">>},
63-
{<<"stun">>, <<"EEC510AF6509201FF97F1F2C87B7977C833BF29C04E985383370EC21F04E4CCF">>},
63+
{<<"stun">>, <<"C54614A592812EA125A2E6827AAC5A438571B591616426EC1419BA9B48252F54">>},
6464
{<<"thoas">>, <<"19A25F31177A17E74004D4840F66D791D4298C5738790FA2CC73731EB911F195">>},
6565
{<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
6666
{<<"wait_helper">>, <<"942967D8B84A2F62DC13F57C7F1B3182D0DA8D3F8D2B4210E85427E12164D8FF">>},
6767
{<<"worker_pool">>, <<"0347B805A8E5804B5676A9885FB3B9B6C1627099C449C3C67C0E8E6AF79E9AA6">>}]},
6868
{pkg_hash_ext,[
6969
{<<"amqp_client">>, <<"AE945F7280617E9A4B17A6D49E3A2F496D716E8088EC29D8E94ECC79E5DA7458">>},
7070
{<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
71-
{<<"cowboy">>, <<"8A7ABE6D183372CEB21CAA2709BEC928AB2B72E18A3911AA1771639BEF82651E">>},
72-
{<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>},
71+
{<<"cowboy">>, <<"E724D3A70995025D654C1992C7B11DBFEA95205C047D86FF9BF1CDA92DDC5614">>},
72+
{<<"cowlib">>, <<"0AF652D1550C8411C3B58EED7A035A7FB088C0B86AFF6BC504B0BC3B7F791AA2">>},
7373
{<<"credentials_obfuscation">>, <<"738ACE0ED5545D2710D3F7383906FC6F6B582D019036E5269C4DBD85DBCED566">>},
7474
{<<"csv">>, <<"741D1A55AABADAA3E0FE13051050101A73E90C4570B9F9403A939D9546813521">>},
7575
{<<"ct_groups_summary_hook">>, <<"997CDE48FEB0C398989E4091A341D4FFF43CFA06CDB8FB2E80CC4A0E0362691C">>},
7676
{<<"escalus">>, <<"FE4BACC8E6875334341872C188A5C68CD749DB362F189617D3520F6D25C7B145">>},
77-
{<<"esip">>, <<"9EF3660CEF93B623F7368DCD5C79F4E704358631909E6DD464E335378815DA1F">>},
77+
{<<"esip">>, <<"19C357E1817B1E04792EF359BF900400F3E6D0E5ADE929FD72F88EA9B44AF2ED">>},
7878
{<<"exml">>, <<"03883AE3E27970E9DAC204B27CE330B54A6C2772455E43FE2319349DFF40B1DC">>},
7979
{<<"fast_pbkdf2">>, <<"74159FD09FB8BF5E97D25137C6C83C28E2CF7E97D7C127D83310DFD0904BD732">>},
8080
{<<"fast_scram">>, <<"39CB1D4C91C99E637E000A3864D274D8A9CB43D86EEC2495FE9546798DBFA015">>},
@@ -88,10 +88,10 @@
8888
{<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
8989
{<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
9090
{<<"rabbit_common">>, <<"EAD31BA292C2CC5FDA48A486417D7CFE8966F661994D7ED6C3E5F8840828E8EC">>},
91-
{<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
91+
{<<"ranch">>, <<"FA0B99A1780C80218A4197A59EA8D3BDAE32FBFF7E88527D7D8A4787EFF4F8E7">>},
9292
{<<"recon">>, <<"96C6799792D735CC0F0FD0F86267E9D351E63339CBE03DF9D162010CEFC26BB0">>},
9393
{<<"stringprep">>, <<"928EBA304C3006EB1512110EBD7B87DB163B00859A09375A1E4466152C6C462A">>},
94-
{<<"stun">>, <<"F6D8A541A29FD13F2CE658B676C0CC661262B96E045B52DEF1644B75EBC0EDEF">>},
94+
{<<"stun">>, <<"6B318244C21E8524A9AAE3AC9A05CD8234EE994C1C2C815DE68D306086AD768D">>},
9595
{<<"thoas">>, <<"E38697EDFFD6E91BD12CEA41B155115282630075C2A727E7A6B2947F5408B86A">>},
9696
{<<"uuid">>, <<"4E4C5CA3461DC47C5E157ED42AA3981A053B7A186792AF972A27B14A9489324E">>},
9797
{<<"wait_helper">>, <<"88FCA7983E1E8A0650FD98062C273E67E807F072C0046C2B102A53FDF467DEEC">>},

‎dialyzer.ignore-warnings

Whitespace-only changes.

‎dialyzer.mk

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎rebar.config

Lines changed: 35 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
%%% Stateless parsers
4949
{exml, "4.1.2", {pkg, hexml}},
5050
{jiffy, "1.1.2"},
51-
{jid, "2.2.0", {pkg, mongoose_jid}},
51+
{jid, "2.2.2", {pkg, mongoose_jid}},
5252
{tomerl, "0.5.0"},
5353
{bbmustache, "1.12.2"},
5454
{erl_csv, "0.3.3"},
@@ -60,8 +60,8 @@
6060
{exometer_report_statsd, {git, "https://github.com/esl/exometer_report_statsd.git", {branch, "master"}}},
6161
{syslogger, "0.3.0"},
6262
{flatlog, "0.1.2"},
63-
{prometheus, "4.11.0"},
64-
{prometheus_cowboy, "0.1.8"},
63+
{prometheus, "5.0.0"},
64+
{prometheus_cowboy, "0.1.9"},
6565

6666
%%% Stateless libraries
6767
{opuntia, "1.1.0"},
@@ -78,9 +78,9 @@
7878

7979
%%% HTTP tools
8080
{graphql, "0.17.1", {pkg, graphql_erl}},
81-
{ranch, "2.1.0"},
82-
{cowboy, "2.12.0"},
83-
{hackney, "1.20.1"},
81+
{ranch, "2.2.0"},
82+
{cowboy, "2.13.0"},
83+
{hackney, "1.23.0"}, %% Erlcloud needs this
8484
{gun, "2.1.0"},
8585
{fusco, "0.1.1"},
8686
{lasse, "1.2.0"},
@@ -89,32 +89,28 @@
8989

9090
%%% Outgoing pools
9191
{cqerl, {git, "https://github.com/esl/cqerl.git", {branch, "master"}}},
92-
{mysql, "1.8.0"},
92+
{mysql, "1.9.0"},
9393
{epgsql, "4.7.1"},
9494
{eodbc, "0.2.0"},
9595
{tirerl, "1.2.0"},
9696
{amqp_client, "4.0.3"},
9797
{rabbit_common, "4.0.3"},
9898
{eredis, "1.7.1"},
99-
{erlcloud, "3.8.2"},
99+
{erlcloud, "3.8.3"},
100100

101101
%%% Internal monitoring and debugging tools
102102
{recon, "2.5.6"},
103-
{observer_cli, "1.8.0"},
104-
{erlang_doctor, "0.2.7"},
105-
106-
%%% Testing deps
107-
{proper, "1.4.0"},
108-
{meck, "0.9.2"},
103+
{observer_cli, "1.8.2"},
104+
{erlang_doctor, "0.2.8"},
109105

110106
%%% Other
111107
{pa, {git, "https://github.com/erszcz/pa.git", {branch, "master"}}},
112108
{jwerl, "1.2.0"},
113109
{cpool, "0.1.0"}, %% Do not upgrade cpool to version 0.1.1, it has bugs
114110
{nksip, {git, "https://github.com/esl/nksip.git", {branch, "mongooseim"}}},
115111

116-
%% knservice pulls lua. We cannot override it, because it is listed in nkservice.app file
117-
{luerl, "1.2.0"}
112+
%% nkservice pulls lua. We cannot override it, because it is listed in nkservice.app file
113+
{luerl, "1.3.0"}
118114
]}.
119115

120116
{relx, [{release, { mongooseim, {cmd, "cat VERSION | tr -d '\r\n'"} },
@@ -165,34 +161,39 @@
165161

166162
{profiles, [ {prod, [{relx, [ {dev_mode, false},
167163
{overlay_vars, "rel/prod.vars-toml.config"},
168-
{overlay, [{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]} ]},
164+
{overlay, [{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]}]},
169165
{erl_opts, [{d, 'PROD_NODE'}]} ]},
170166
%% development nodes
171167
{mim1, [{relx, [ {overlay_vars, "rel/mim1.vars-toml.config"},
172168
{overlay, [
173169
{copy, "rel/files/cets_disco.txt", "etc/cets_disco.txt"},
174-
{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]} ]}]},
170+
{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]}]},
171+
{deps, [{proper, "1.5.0"}, {meck, "1.0.0"}, {wait_helper, "0.2.1"}]}]},
175172
{mim2, [{relx, [ {overlay_vars, "rel/mim2.vars-toml.config"},
176173
{overlay, [
177174
{copy, "rel/files/cets_disco.txt", "etc/cets_disco.txt"},
178-
{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]} ]}]},
175+
{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]}]},
176+
{deps, [{proper, "1.5.0"}, {meck, "1.0.0"}, {wait_helper, "0.2.1"}]}]},
179177
{mim3, [{relx, [ {overlay_vars, "rel/mim3.vars-toml.config"},
180178
{overlay, [
181179
{copy, "rel/files/cets_disco.txt", "etc/cets_disco.txt"},
182-
{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]} ]}]},
183-
{fed1, [{relx, [ {overlay_vars, "rel/fed1.vars-toml.config"},
184-
{overlay, [{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]} ]}]},
185-
{reg1, [{relx, [ {overlay_vars, "rel/reg1.vars-toml.config"},
186-
{overlay, [{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]} ]}]},
180+
{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]}]},
181+
{deps, [{proper, "1.5.0"}, {meck, "1.0.0"}, {wait_helper, "0.2.1"}]}]},
182+
{fed1, [{relx, [{overlay_vars, "rel/fed1.vars-toml.config"},
183+
{overlay, [{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]}]},
184+
{deps, [{proper, "1.5.0"}, {meck, "1.0.0"}, {wait_helper, "0.2.1"}]}]},
185+
{reg1, [{relx, [{overlay_vars, "rel/reg1.vars-toml.config"},
186+
{overlay, [{template, "rel/files/mongooseim.toml", "etc/mongooseim.toml"}]}]},
187+
{deps, [{proper, "1.5.0"}, {meck, "1.0.0"}, {wait_helper, "0.2.1"}]}]},
187188
{test, [{extra_src_dirs, [{"test", [{recursive, true}]}]},
188-
{deps, [{wait_helper, "0.2.1"}]}]}
189+
{deps, [{proper, "1.5.0"}, {meck, "1.0.0"}, {wait_helper, "0.2.1"}]}]}
189190
]}.
190191

191192
{plugins,
192193
[
193-
{provider_asn1, "0.3.0"},
194+
{provider_asn1, "0.4.1"},
194195
{rebar3_codecov, "0.7.0"},
195-
{rebar3_lint, "2.0.1"}
196+
{rebar3_lint, "~> 4.0"}
196197
]}.
197198

198199
{provider_hooks,
@@ -201,28 +202,16 @@
201202
}]}.
202203

203204
{overrides,
204-
[{override, stringprep,
205-
[ {provider_hooks,
206-
[ {post, [ {compile, {pc, compile}},
207-
{clean, {pc, clean}} ] }] } ]},
208-
%% Disable unsupported plugins for hamcrest-erlang
209-
{override, hamcrest, [{plugins, []}]},
210-
{del, eper, [{erl_opts, [warnings_as_errors]}]},
205+
[
206+
%% See https://github.com/ninenines/cowboy/issues/1670
207+
{override, cowboy, [{deps, [{cowlib, "~> 2.0"}]}]},
211208
%% Erlang JWT Library is in elixir and wants elvis for tests
212209
%% Remove elvis plugin to reduce deps
213210
{override, jwerl, [{plugins, [rebar3_elixir, rebar3_hex]}]},
214-
%% Remove rebar3_archive_plugin
215-
{override, prometheus_cowboy, [{plugins, []}]},
216-
%% Remove rebar3_elvis_plugin
217-
{override, prometheus_cowboy, [{profiles, [{test, []}]}]},
218-
%% Remove rebar3_archive_plugin
219-
{override, prometheus_httpd, [{plugins, []}]},
220-
%% Remove rebar3_elvis_plugin
221-
{override, prometheus_httpd, [{profiles, [{test, []}]}]},
222-
%% Remove rebar3_archive_plugin
223-
{override, accept, [{plugins, []}]},
224-
%% Remove rebar3_elvis_plugin
225-
{override, accept, [{profiles, [{test, []}]}]},
211+
%% Remove forced proper deps
212+
{override, nklib, [{deps, []}]},
213+
%% Remove forced proper deps
214+
{override, pa, [{deps, []}]},
226215
%% Force update of `backoff`
227216
{override, cpool, [{deps, [{backoff, "1.1.6"}]}]},
228217
%% Remove test profile (pulling old proper) from `backoff`

0 commit comments

Comments
 (0)