Merge pull request #4338 from esl/update-deps-for-27

esl · Jul 30, 2024 · 8f6c421 · 8f6c421
2 parents 4cbb09c + 4e5a085
commit 8f6c421
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/big_tests/rebar.config b/big_tests/rebar.config
@@ -19,7 +19,8 @@
         {escalus, "4.2.14"},
         {cowboy, "2.12.0"},
         {csv, "3.0.3", {pkg, csve}},
-        {amqp_client, "3.12.14"},
+        {amqp_client, "3.13.0-rc.2"},
+        {rabbit_common, "3.13.4"},
         {esip, "1.0.52"},
         {jid, "2.1.0", {pkg, mongoose_jid}}
 ]}.
diff --git a/big_tests/rebar.lock b/big_tests/rebar.lock
@@ -1,5 +1,5 @@
 {"1.2.0",
-[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.12.14">>},0},
+[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.13.0-rc.2">>},0},
  {<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},0},
  {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},0},
@@ -24,17 +24,17 @@
  {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.25">>},1},
  {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},2},
- {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.12.14">>},1},
+ {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.13.4">>},0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
- {<<"recon">>,{pkg,<<"recon">>,<<"2.5.3">>},2},
+ {<<"recon">>,{pkg,<<"recon">>,<<"2.5.3">>},1},
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.29">>},1},
  {<<"stun">>,{pkg,<<"stun">>,<<"1.2.12">>},1},
- {<<"thoas">>,{pkg,<<"thoas">>,<<"1.0.0">>},2},
+ {<<"thoas">>,{pkg,<<"thoas">>,<<"1.0.0">>},1},
  {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},1},
  {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.2.0">>},1}]}.
 [
 {pkg_hash,[
- {<<"amqp_client">>, <<"2B677BC3F2E2234BA7517042B25D72071A79735042E91F9116BD3C176854B622">>},
+ {<<"amqp_client">>, <<"2C9975DA52319D8E613B5DBD3E931374B41AF6F571BD7A3F96CE50AD6C27441B">>},
  {<<"base16">>, <<"F0549F732E03BE8124ED0D19FD5EE52146CC8BE24C48CBC3F23AB44B157F11A2">>},
  {<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
  {<<"cowboy">>, <<"F276D521A1FF88B2B9B4C54D0E753DA6C66DD7BE6C9FCA3D9418B561828A3731">>},
@@ -57,7 +57,7 @@
  {<<"p1_utils">>, <<"2D39B5015A567BBD2CC7033EEB93A7C60D8C84EFE1EF69A3473FAA07FA268187">>},
  {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
  {<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
- {<<"rabbit_common">>, <<"466123EE7346A3CDAC078C0C302BCD36DA4523E8ACD678C1B992F7B4DF1F7914">>},
+ {<<"rabbit_common">>, <<"68650FBCB8CE204CE28C116451C030E294BF916ED722B43A369D7586DA2A5605">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"recon">>, <<"739107B9050EA683C30E96DE050BC59248FD27EC147696F79A8797FF9FA17153">>},
  {<<"stringprep">>, <<"02F23E8C3A219A3DFE40A22E908BECE3A2F68AF0FF599EA8A7B714ECB21E62EE">>},
@@ -66,7 +66,7 @@
  {<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
  {<<"worker_pool">>, <<"506DE38C528A81ED2C6A80A419B83DDE6DA5E295BD320BDF4D35A69AFEB0247A">>}]},
 {pkg_hash_ext,[
- {<<"amqp_client">>, <<"5F70B6C3B1A739790080DA4FDDC94A867E99F033C4B1EDC20D6FF8B8FB4BD160">>},
+ {<<"amqp_client">>, <<"E86FD4B95291799BDE1571AF81077B5A5DB9653824FBE429F5BADAD831C52642">>},
  {<<"base16">>, <<"06EA2D48343282E712160BA89F692B471DB8B36ABE8394F3445FF9032251D772">>},
  {<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
  {<<"cowboy">>, <<"8A7ABE6D183372CEB21CAA2709BEC928AB2B72E18A3911AA1771639BEF82651E">>},
@@ -89,7 +89,7 @@
  {<<"p1_utils">>, <<"9219214428F2C6E5D3187FF8EB9A8783695C2427420BE9A259840E07ADA32847">>},
  {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
  {<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
- {<<"rabbit_common">>, <<"70C31A51F7401CC0204DDEF2745D98680C2E0DF67E3B0C9E198916881FDE3293">>},
+ {<<"rabbit_common">>, <<"C0E8F2909EAECABC732990D26B75DE092E265D14E8AC9EAFD4813438F1CC2233">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"recon">>, <<"6C6683F46FD4A1DFD98404B9F78DCABC7FCD8826613A89DCB984727A8C3099D7">>},
  {<<"stringprep">>, <<"928EBA304C3006EB1512110EBD7B87DB163B00859A09375A1E4466152C6C462A">>},

diff --git a/rebar.config b/rebar.config
@@ -80,7 +80,7 @@
   %%% Stateful apps
   {cache_tab, "1.0.30"},
   {segmented_cache, "0.3.0"},
-  {worker_pool, "6.0.1"},
+  {worker_pool, "6.2.1"},
   {cets, {git, "https://github.com/esl/cets.git", {branch, "main"}}},
 
   %%% HTTP tools
@@ -100,7 +100,8 @@
   {epgsql, "4.7.1"},
   {eodbc, "0.2.0"},
   {tirerl, "1.2.0"},
-  {amqp_client, "3.12.6"},
+  {amqp_client, "3.13.0-rc.2"},
+  {rabbit_common, "3.13.4"},
   {eredis, "1.7.0"},
   {erlcloud, "3.6.5"},
 
@@ -118,7 +119,10 @@
   {jwerl, "1.2.0"},
   {cpool, "0.1.0"}, %% Do not upgrade cpool to version 0.1.1, it has bugs
   {nkpacket, {git, "https://github.com/esl/nkpacket.git", {branch, "mongooseim-ranch-compatibility"}}},
-  {nksip, {git, "https://github.com/arcusfelis/nksip.git", {branch, "mu-fix-dialyzer"}}}
+  {nksip, {git, "https://github.com/arcusfelis/nksip.git", {branch, "mu-fix-dialyzer"}}},
+
+  %% knservice pulls lua. We cannot override it, because it is listed in nkservice.app file
+  {luerl, "1.2.0"}
  ]}.
 
 {relx, [{release, { mongooseim, {cmd, "cat VERSION | tr -d '\r\n'"} },
@@ -215,9 +219,7 @@
    %% Erlang JWT Library is in elixir and wants elvis for tests
    %% Remove elvis plugin to reduce deps
    {override, jwerl, [{plugins, [rebar3_elixir, rebar3_hex]}]},
-   %% GraphQL pulls geas_rebar3, which is a dev dependency
-   %% geas takes some time to compile, but we do not need it
-   {override, graphql, [{plugins, [rebar3_hex]}]}
+   {override, worker_pool, [{minimum_otp_vsn, "24"}]}
  ]}.
 
 {dialyzer, [

diff --git a/rebar.lock b/rebar.lock
@@ -54,7 +54,7 @@
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"graphql">>,
   {git,"https://github.com/esl/graphql-erlang.git",
-       {ref,"7b1762f863571e12b5c458417d505656d342fb46"}},
+       {ref,"4ab1ff2f01fe71799a0a2d7e31964ff80b13342d"}},
   0},
  {<<"gun">>,{pkg,<<"gun">>,<<"1.3.3">>},0},
  {<<"hackney">>,{pkg,<<"hackney">>,<<"1.18.1">>},0},
@@ -66,10 +66,7 @@
  {<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0},
  {<<"lasse">>,{pkg,<<"lasse">>,<<"1.2.0">>},0},
  {<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.6.2">>},1},
- {<<"luerl">>,
-  {git,"https://github.com/rvirding/luerl.git",
-       {ref,"5e61c1838d08430af67fb870995b05a41d64aeee"}},
-  2},
+ {<<"luerl">>,{pkg,<<"luerl">>,<<"1.2.0">>},0},
  {<<"lz4">>,
   {git,"https://github.com/szktty/erlang-lz4.git",
        {ref,"e7ccf4fc9a806982055f26772522c3543c89d1b5"}},
@@ -105,7 +102,7 @@
  {<<"pooler">>,{pkg,<<"pooler">>,<<"1.5.3">>},1},
  {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.5">>},1},
- {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.12.6">>},1},
+ {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.13.4">>},0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"2.1.0">>},0},
  {<<"re2">>,{pkg,<<"re2">>,<<"1.9.7">>},1},
  {<<"recon">>,{pkg,<<"recon">>,<<"2.5.3">>},0},
@@ -122,13 +119,13 @@
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.29">>},1},
  {<<"syslogger">>,{pkg,<<"syslogger">>,<<"0.3.0">>},0},
  {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.2.0">>},0},
- {<<"thoas">>,{pkg,<<"thoas">>,<<"1.0.0">>},2},
+ {<<"thoas">>,{pkg,<<"thoas">>,<<"1.0.0">>},1},
  {<<"tirerl">>,{pkg,<<"tirerl">>,<<"1.2.0">>},0},
  {<<"tomerl">>,{pkg,<<"tomerl">>,<<"0.5.0">>},0},
  {<<"trails">>,{pkg,<<"trails">>,<<"2.3.0">>},0},
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},1},
  {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.5">>},0},
- {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.0.1">>},0}]}.
+ {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.2.1">>},0}]}.
 [
 {pkg_hash,[
  {<<"amqp_client">>, <<"B0050183BB4CFBD5B3F9A3276689DFA135A196AEDC3584110F231B2CE04B0426">>},
@@ -168,6 +165,7 @@
  {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
  {<<"lasse">>, <<"DB8F06983B235F6C4C86AC79BCF23EDDCA16FCCCAD1EB45F222852BB133BD793">>},
  {<<"lhttpc">>, <<"044F16F0018C7AA7E945E9E9406C7F6035E0B8BC08BF77B00C78CE260E1071E3">>},
+ {<<"luerl">>, <<"60F05F4240F0E7C148DDB79B67B8FF972734AAD237AA74C83D0748B8214C8EF0">>},
  {<<"meck">>, <<"85CCBAB053F1DB86C7CA240E9FC718170EE5BDA03810A6292B5306BF31BAE5F5">>},
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
@@ -179,7 +177,7 @@
  {<<"pooler">>, <<"898CD1FA301FC42D4A8ED598CE139B71CA85B54C16AB161152B5CC5FBDCFA1A8">>},
  {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
  {<<"quickrand">>, <<"06FCAD85CB47D5C85C51D6BC9C84A082501BA098A89D64AD0A2F69599E034C04">>},
- {<<"rabbit_common">>, <<"FEBD37E11483F94B614CD636C1EDBCE1099FF64866598F75D0A624D3A60437C6">>},
+ {<<"rabbit_common">>, <<"68650FBCB8CE204CE28C116451C030E294BF916ED722B43A369D7586DA2A5605">>},
  {<<"ranch">>, <<"2261F9ED9574DCFCC444106B9F6DA155E6E540B2F82BA3D42B339B93673B72A3">>},
  {<<"re2">>, <<"8114654E72EF62F605A8A393F219702F253CB7A02F671503918B76D0614DB046">>},
  {<<"recon">>, <<"739107B9050EA683C30E96DE050BC59248FD27EC147696F79A8797FF9FA17153">>},
@@ -194,7 +192,7 @@
  {<<"trails">>, <<"B09703F056705F4943E14FFF077B98C711A6F48FAD40F4FF0B350794074AD69C">>},
  {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>},
  {<<"uuid">>, <<"60FAEEB7EDFD40847ED13CB0DD1044BAABE4E79A00C0CA9C4D13A073914B1016">>},
- {<<"worker_pool">>, <<"CA262C2DFB3B4AF661B206C82065D86F83922B7227508AA6E0BC34D3E5AE5135">>}]},
+ {<<"worker_pool">>, <<"BD98A0BE1D20057AE9967CBE73D263AEA5BE14BBE4C73CAFEB1378572FF14561">>}]},
 {pkg_hash_ext,[
  {<<"amqp_client">>, <<"B856F6404E7AF98C90DA870C8CE50D1380F13F2CEE02F16564B5CC5142BAE308">>},
  {<<"backoff">>, <<"30CEAD738D20E4C8D36CD37857DD5E23AEBA57CB868BF64766D47D371422BDFF">>},
@@ -233,6 +231,7 @@
  {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
  {<<"lasse">>, <<"8081769683F73D76A718319A593F8551A0D3747404C51CCE5869CFC6AEDC7EDF">>},
  {<<"lhttpc">>, <<"76B5FA6149D1E10D4B1FBC4EBD51D371DB19C1AB9F0A9ECF5B526440DF064E97">>},
+ {<<"luerl">>, <<"9CAFD4F6094FF0F5A9D278FD81D60D3E026C820BDFB6CACD4B1BD909F21B525D">>},
  {<<"meck">>, <<"81344F561357DC40A8344AFA53767C32669153355B626EA9FCBC8DA6B3045826">>},
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
@@ -244,7 +243,7 @@
  {<<"pooler">>, <<"058D85C5081289B90E97E4DDDBC3BB5A3B4A19A728AB3BC88C689EFCC36A07C7">>},
  {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
  {<<"quickrand">>, <<"252CF0493570EBF1A58985CB71990982CDDCD4396B6427F1E10CF58924C1C052">>},
- {<<"rabbit_common">>, <<"D85282C8C9BE456B42AA4B265EDE68D176CA8A28DFCF1D521BE19267167C0DC3">>},
+ {<<"rabbit_common">>, <<"C0E8F2909EAECABC732990D26B75DE092E265D14E8AC9EAFD4813438F1CC2233">>},
  {<<"ranch">>, <<"244EE3FA2A6175270D8E1FC59024FD9DBC76294A321057DE8F803B1479E76916">>},
  {<<"re2">>, <<"FF0703CA095B5BEBF57DD12571AF24B3BA404180E9B5E43128790B5D31EBE803">>},
  {<<"recon">>, <<"6C6683F46FD4A1DFD98404B9F78DCABC7FCD8826613A89DCB984727A8C3099D7">>},
@@ -259,5 +258,5 @@
  {<<"trails">>, <<"40804001EB80417AA9D02400F39B7216956C3F251539A8A6096A69B3FAC0EA07">>},
  {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>},
  {<<"uuid">>, <<"E54373262CA88401689277947C54B95E9ECBC977BD5C57C9DD44AD9DA278E360">>},
- {<<"worker_pool">>, <<"772E12CCB26909EA7F804B52E86E733DF66BB8150F683B591B0A762196494C74">>}]}
+ {<<"worker_pool">>, <<"64E560DE08CA5E7DB8BD4CDCC7B744B0659696194E3BC9E56239BA4A0F7E24F9">>}]}
 ].