Skip to content

Commit 48dfbc4

Browse files
authored
Merge pull request #96 from esl/adjust-codebase-to-use-xmpp-arsenal
Adjust codebase to use amoc-xmpp-arsenal - part 2
2 parents 4ec4939 + 14b8435 commit 48dfbc4

26 files changed

+26
-3486
lines changed

rebar.config

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
{jiffy, "0.15.2"},
1212
{trails, "2.1.0"},
1313
{cowboy_swagger, "2.1.0"},
14-
{escalus, {git, "git://github.com/esl/escalus.git", {ref, "5794d0a"}}},
15-
{usec, {git, "git://github.com/esl/usec.git", {branch, "master"}}},
16-
{exometer, {git, "git://github.com/Feuerlabs/exometer.git", {ref, "7a7bd8d"}}},
14+
{exometer_core, {git, "https://github.com/esl/exometer_core.git", {branch, "master"}}},
15+
{exometer_report_graphite, {git, "https://github.com/esl/exometer_report_graphite.git", {branch, "master"}}},
16+
{exometer_report_statsd, {git, "https://github.com/esl/exometer_report_statsd.git", {branch, "master"}}},
1717
{recon, "2.4.0"},
1818
{meck, "0.8.12"},
1919
{proper, "1.3.0"},
2020
{cowboy, "2.3.0"},
21-
{fusco, {git, "https://github.com/esl/fusco.git", {ref, "de08ade"}}},
22-
{amqp_client, "3.7.9"}
21+
{fusco, {git, "https://github.com/esl/fusco.git", {ref, "de08ade"}}}
2322
]}.
2423

2524
{relx, [

rebar.config.script

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

rebar.lock

Lines changed: 18 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,50 @@
11
{"1.1.0",
2-
[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.7.9">>},0},
3-
{<<"base16">>,
4-
{git,"https://github.com/goj/base16.git",
5-
{ref,"ec420aa4ce0fb971f155274c606e00188a2ed37d"}},
6-
1},
7-
{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.6.1">>},1},
8-
{<<"bear">>,
9-
{git,"git://github.com/boundary/bear.git",
10-
{ref,"119234548783af19b8ec75c879c5062676b92571"}},
11-
3},
2+
[{<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},1},
123
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.3.0">>},0},
134
{<<"cowboy_swagger">>,{pkg,<<"cowboy_swagger">>,<<"2.1.0">>},0},
145
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.2.1">>},1},
15-
{<<"edown">>,
16-
{git,"git://github.com/uwiger/edown.git",
17-
{ref,"b7c8eb0ac1859f8fce11cbfe3526f5ec83194776"}},
18-
3},
19-
{<<"escalus">>,
20-
{git,"git://github.com/esl/escalus.git",
21-
{ref,"5794d0abcb4838a8de32da629c49a288f3516570"}},
6+
{<<"exometer_core">>,
7+
{git,"https://github.com/esl/exometer_core.git",
8+
{ref,"6303e88d753f2a9c0ac4d7a5ba0151b765290a46"}},
229
0},
23-
{<<"exml">>,
24-
{git,"https://github.com/esl/exml.git",
25-
{ref,"a307e83669ad0a8d96ea3f2be9da36417efb94fc"}},
26-
1},
27-
{<<"exometer">>,
28-
{git,"git://github.com/Feuerlabs/exometer.git",
29-
{ref,"7a7bd8d2b52de4d90f65aa3f6044b0e988319b9e"}},
10+
{<<"exometer_report_graphite">>,
11+
{git,"https://github.com/esl/exometer_report_graphite.git",
12+
{ref,"264dd7bcbadbd7febcd43917302251286c88b681"}},
13+
0},
14+
{<<"exometer_report_statsd">>,
15+
{git,"https://github.com/esl/exometer_report_statsd.git",
16+
{ref,"75f6f9ef2b3c0a677f9dba9a4b3d9d77c276a032"}},
3017
0},
31-
{<<"exometer_core">>,
32-
{git,"git://github.com/Feuerlabs/exometer_core.git",
33-
{ref,"d7c4ddd066b5a56f7118bdb00dd7b22277340a35"}},
34-
1},
35-
{<<"folsom">>,
36-
{git,"git://github.com/boundary/folsom",
37-
{ref,"38e2cce7c64ce1f0a3a918d90394cfc0a940b1ba"}},
38-
2},
3918
{<<"fusco">>,
4019
{git,"https://github.com/esl/fusco.git",
4120
{ref,"de08adef32d12f0984d6d1c6fec28be207db2e7e"}},
4221
0},
4322
{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
44-
{<<"gun">>,{pkg,<<"gun">>,<<"1.3.0">>},1},
23+
{<<"hut">>,{pkg,<<"hut">>,<<"1.2.0">>},1},
4524
{<<"jiffy">>,{pkg,<<"jiffy">>,<<"0.15.2">>},0},
4625
{<<"jsx">>,{pkg,<<"jsx">>,<<"2.9.0">>},1},
4726
{<<"lager">>,{pkg,<<"lager">>,<<"3.6.8">>},0},
4827
{<<"meck">>,{pkg,<<"meck">>,<<"0.8.12">>},0},
49-
{<<"mustache">>,
50-
{git,"https://github.com/mojombo/mustache.erl.git",
51-
{ref,"d0246fe143058b6404f66cf99fece3ff6e87b7ed"}},
52-
1},
53-
{<<"parse_trans">>,
54-
{git,"git://github.com/uwiger/parse_trans.git",
55-
{ref,"a210adafdfbb904d156d8f22abd5fb58fc17de1e"}},
56-
2},
28+
{<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},1},
5729
{<<"proper">>,{pkg,<<"proper">>,<<"1.3.0">>},0},
58-
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.7.5">>},2},
59-
{<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.7.9">>},1},
6030
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.4.0">>},1},
61-
{<<"ranch_proxy_protocol">>,{pkg,<<"ranch_proxy_protocol">>,<<"2.1.1">>},2},
6231
{<<"recon">>,{pkg,<<"recon">>,<<"2.4.0">>},0},
63-
{<<"setup">>,
64-
{git,"git://github.com/uwiger/setup.git",
65-
{ref,"85447ca5eb671db0517a475791ac7fb3604bf44d"}},
66-
2},
67-
{<<"trails">>,{pkg,<<"trails">>,<<"2.1.0">>},0},
68-
{<<"usec">>,
69-
{git,"git://github.com/esl/usec.git",
70-
{ref,"f85ffd8350d7000c26392c18bdfcdbb30f3b5ee8"}},
71-
0},
72-
{<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.5">>},1},
73-
{<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"3.2.0">>},1}]}.
32+
{<<"trails">>,{pkg,<<"trails">>,<<"2.1.0">>},0}]}.
7433
[
7534
{pkg_hash,[
76-
{<<"amqp_client">>, <<"EBEF998500C31D4954E882868806258A9CEBF01DD6C76804B1A2EFDB454753FC">>},
77-
{<<"bbmustache">>, <<"9FB63FA60BD53AFBF47F02E6D8BD6B2BEAFC068E02E20975254DC7461FD4F397">>},
35+
{<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
7836
{<<"cowboy">>, <<"268429481D6F41AD5564ADE4A2439C284B569083FCA0D19078AD4F56B4624724">>},
7937
{<<"cowboy_swagger">>, <<"53C36D4228E139F65DB4DB716C1A5BF9CE6DA9BF04C4C785EBB3A1A462CAD223">>},
8038
{<<"cowlib">>, <<"1AFA5B233CEE8F642C153EC6F1DC48DB0DD9A43E2114BC8B43E9D59636F6AE1F">>},
8139
{<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
82-
{<<"gun">>, <<"18E5D269649C987AF95AEC309F68A27FFC3930531DD227A6EAA0884D6684286E">>},
40+
{<<"hut">>, <<"0089DF0FAA2827C605BBADA88153F24FFF5EA7A4BE32ECF0250A7FDC2719CAFB">>},
8341
{<<"jiffy">>, <<"DE266C390111FD4EA28B9302F0BC3D7472468F3B8E0ACEABFBEFA26D08CD73B7">>},
8442
{<<"jsx">>, <<"D2F6E5F069C00266CAD52FB15D87C428579EA4D7D73A33669E12679E203329DD">>},
8543
{<<"lager">>, <<"897EFC7679BB82383448646C96768CDC4E747464DD18B999C7AACA485686B0DA">>},
8644
{<<"meck">>, <<"1F7B1A9F5D12C511848FEC26BBEFD09A21E1432EADB8982D9A8ACEB9891A3CF2">>},
45+
{<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
8746
{<<"proper">>, <<"C1ACD51C51DA17A2FE91D7A6FC6A0C25A6A9849D8DC77093533109D1218D8457">>},
88-
{<<"quickrand">>, <<"E3086A153EB13A057FC19192D05E2D4C6BB2BDBB55746A699BEAE9847AC17CA8">>},
89-
{<<"rabbit_common">>, <<"542D2EB8EF8F76E5346B30665604D8D63B8D5CF47D1878243CEC44D1642C4435">>},
9047
{<<"ranch">>, <<"10272F95DA79340FA7E8774BA7930B901713D272905D0012B06CA6D994F8826B">>},
91-
{<<"ranch_proxy_protocol">>, <<"3C4723327166D2D63C0405F4914E2E471C6DE362CC844E9B203AF5763E7C9D25">>},
9248
{<<"recon">>, <<"901FF78B39C754FB4D6FD72DCF0DBD398967BBD2E4D59C08D4D7AA44A73DE91D">>},
93-
{<<"trails">>, <<"D51D7F065F2B692654C611C663BFAC377D47EAFF9D38D0C17ECD031D1A59399A">>},
94-
{<<"uuid">>, <<"3862FF9A21C42566DFD0376B97512FA202922897129E09A05E2AFA0D9CAFD97A">>},
95-
{<<"worker_pool">>, <<"54DD752BA4CA4B702124C45803AA958B36BCE77D683B87886606F1AADA3E124D">>}]}
49+
{<<"trails">>, <<"D51D7F065F2B692654C611C663BFAC377D47EAFF9D38D0C17ECD031D1A59399A">>}]}
9650
].

0 commit comments

Comments
 (0)