From 265937e91a7c622ccca9231f65a74181ac3aacda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chrz=C4=85szcz?=
 <pawel.chrzaszcz@erlang-solutions.com>
Date: Thu, 21 Dec 2023 18:30:22 +0100
Subject: [PATCH] Use the new exml and escalus (temporarily)

- exml has the fix for max_element_size
- escalus has the fix for handling the 'close' element in websockets
---
 big_tests/rebar.config | 2 +-
 big_tests/rebar.lock   | 7 ++++---
 rebar.config           | 2 +-
 rebar.lock             | 7 ++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/big_tests/rebar.config b/big_tests/rebar.config
index f359d0cf45d..c0c8a7d784e 100644
--- a/big_tests/rebar.config
+++ b/big_tests/rebar.config
@@ -16,7 +16,7 @@
         {proper, "1.4.0"},
         {gun, "2.0.0-rc.2"},
         {fusco, "0.1.1"},
-        {escalus, "4.2.10"},
+        {escalus, {git, "https://github.com/esl/escalus.git", {branch, "fix-ws-close"}}},
         {cowboy, "2.9.0"},
         {csv, "3.0.3", {pkg, csve}},
         {amqp_client, "3.12.6"},
diff --git a/big_tests/rebar.lock b/big_tests/rebar.lock
index 86d5c7ed90b..7dda0914bc1 100644
--- a/big_tests/rebar.lock
+++ b/big_tests/rebar.lock
@@ -8,7 +8,10 @@
   {pkg,<<"credentials_obfuscation">>,<<"3.4.0">>},
   1},
  {<<"csv">>,{pkg,<<"csve">>,<<"3.0.3">>},0},
- {<<"escalus">>,{pkg,<<"escalus">>,<<"4.2.10">>},0},
+ {<<"escalus">>,
+  {git,"https://github.com/esl/escalus.git",
+       {ref,"6128b7e0fda55658c2607149f74544e989f61875"}},
+  0},
  {<<"esip">>,{pkg,<<"esip">>,<<"1.0.48">>},0},
  {<<"exml">>,{pkg,<<"hexml">>,<<"3.3.3">>},0},
  {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.3">>},2},
@@ -41,7 +44,6 @@
  {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
  {<<"credentials_obfuscation">>, <<"34E18B126B3AEFD6E8143776FBE1CECEEA6792307C99AC5EE8687911F048CFD7">>},
  {<<"csv">>, <<"69E7D9B3FDC72016644368762C6A3E6CBFEB85BCCADBF1BD99AB6C827E360E04">>},
- {<<"escalus">>, <<"3640C7EA77BCE0E5191751D9A02EF3A68CD0005F2705EC19026DFD96577D0434">>},
  {<<"esip">>, <<"3B3B3AFC798BE9458517D4FD2730674322368E54C2C1211AA630327354946D1B">>},
  {<<"exml">>, <<"C64FE46373886FD62F3F753D8031034E231DC0C138F9CD3539F738EF220F0960">>},
  {<<"fast_pbkdf2">>, <<"4F09D6C6C20DBEE1970E0A6AE91432E1B7731F88426C671D083BAC31FFA1FDAD">>},
@@ -73,7 +75,6 @@
  {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
  {<<"credentials_obfuscation">>, <<"738ACE0ED5545D2710D3F7383906FC6F6B582D019036E5269C4DBD85DBCED566">>},
  {<<"csv">>, <<"741D1A55AABADAA3E0FE13051050101A73E90C4570B9F9403A939D9546813521">>},
- {<<"escalus">>, <<"08A84CAB2EDCE5F69EA5B93F039E6D7047FB3FF10CBD5B5AB855EE3144743B56">>},
  {<<"esip">>, <<"02B9FC6E071415CBC62105F5115AEB68D11184BDAD3960DA7B62EA3E99E7FCCF">>},
  {<<"exml">>, <<"CB54BF62E2902B52FE9CAF7E65176E764E8A10CCC51DE2DEDC0FC5C8D9F91AC6">>},
  {<<"fast_pbkdf2">>, <<"2900431E2E6402F23A92754448BBD949DA366BC9C984FDC791DDCFCC41042434">>},
diff --git a/rebar.config b/rebar.config
index 33afbeac85d..92d7c81c26d 100644
--- a/rebar.config
+++ b/rebar.config
@@ -53,7 +53,7 @@
  [
   %%% Stateless parsers
   {base16, "2.0.1"},
-  {exml, "3.3.3", {pkg, hexml}},
+  {exml, {git, "https://github.com/esl/exml.git", {branch, "max-element-size"}}},
   {jiffy, "1.1.1"},
   {jid, "2.0.0", {pkg, mongoose_jid}},
   {tomerl, "0.5.0"},
diff --git a/rebar.lock b/rebar.lock
index 988b92ca7ea..fab1afc4bde 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -31,7 +31,10 @@
  {<<"eredis">>,{pkg,<<"eredis">>,<<"1.7.0">>},0},
  {<<"erl_csv">>,{pkg,<<"erl_csv">>,<<"0.3.1">>},0},
  {<<"erlcloud">>,{pkg,<<"erlcloud">>,<<"3.6.5">>},0},
- {<<"exml">>,{pkg,<<"hexml">>,<<"3.3.3">>},0},
+ {<<"exml">>,
+  {git,"https://github.com/esl/exml.git",
+       {ref,"b9500bd9cef5a37782734f51310f9e713097dfb9"}},
+  0},
  {<<"exometer_core">>,
   {git,"https://github.com/esl/exometer_core.git",
        {ref,"123daa053a4abb3ff4bdbf52f08344da535294e9"}},
@@ -148,7 +151,6 @@
  {<<"eredis">>, <<"7A9B2B51ECDE73AF3399B344C6C7FA5141E6C77DF5FACE86E41E8365A1E5B08F">>},
  {<<"erl_csv">>, <<"5AD1BB8093D198191384F2E96EB879B08B23F14E5F6FAD8D80BDC3EB623DE8DA">>},
  {<<"erlcloud">>, <<"75B93168BF6F9CD4573B261D8F83FD2C89F7809AFEAAADABFA39ECE3F75F3055">>},
- {<<"exml">>, <<"C64FE46373886FD62F3F753D8031034E231DC0C138F9CD3539F738EF220F0960">>},
  {<<"fast_pbkdf2">>, <<"4F09D6C6C20DBEE1970E0A6AE91432E1B7731F88426C671D083BAC31FFA1FDAD">>},
  {<<"fast_scram">>, <<"BD0B946911B07D36EC22AD950FF22F77F27B94E4E24452AF966597C6D8CB5E7F">>},
  {<<"fast_tls">>, <<"85FA7F3112EA4FF5CCB4F3ABADC130A8C855AD74EB00869487399CB0C322D208">>},
@@ -212,7 +214,6 @@
  {<<"eredis">>, <<"A49E7B11A2E1DF91EC3DA565DBD1A9530C95A5AC03127D3810D735F9EABF6F2E">>},
  {<<"erl_csv">>, <<"21186276E59258F6F35F1CA2ECDFA995508B2E0055D502DCA1DCD09E3231F445">>},
  {<<"erlcloud">>, <<"9E482E6B1C956A649AE878CBE46494BC36E6CAFA1C677B30158C0ED4BAD789E9">>},
- {<<"exml">>, <<"CB54BF62E2902B52FE9CAF7E65176E764E8A10CCC51DE2DEDC0FC5C8D9F91AC6">>},
  {<<"fast_pbkdf2">>, <<"2900431E2E6402F23A92754448BBD949DA366BC9C984FDC791DDCFCC41042434">>},
  {<<"fast_scram">>, <<"D45B746B8D17C0F73A94CBDB526E115A4AEDFECB4D42CA935BCB1195D783B4E1">>},
  {<<"fast_tls">>, <<"AA08CCA89B4044E74F1F12E399817D8BEAEAE3EE006C98A893C0BFB1D81FBA51">>},