Changed riak version

AntidoteDB · Jul 29, 2019 · 907fc60 · 907fc60
1 parent 119ef5f
commit 907fc60
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 57 deletions.
diff --git a/config/sys-debug.config b/config/sys-debug.config
@@ -4,12 +4,6 @@
               %% Default location of ringstate
               {ring_state_dir, "data.antidote@127.0.0.1/ring"},
               {platform_data_dir, "data.antidote@127.0.0.1"},
-              {schema_dirs, [
-                "_build/default/lib/cuttlefish/priv/",
-                "_build/default/lib/riak_core/priv/",
-                "_build/default/lib/riak_sysmon/priv/",
-                "_build/default/lib/eleveldb/priv/"
-              ]},
 
               %% riak_handoff_port is the TCP port that Riak uses for
               %% intra-cluster data handoff.

diff --git a/rebar.config b/rebar.config
@@ -1,10 +1,8 @@
 {deps, [
-    %% overwrite lager dependency since current version disables logger messages (see https://github.com/erlang-lager/lager/issues/492)
-    {lager, {git, "https://github.com/erlang-lager/lager", {ref, "411edc71ee9823f6ab9c6f617daccce3c6798a29"}}},
     %% riak framework
-    {riak_core, "3.1.1", {pkg,riak_core_ng}},
+    {riak_core, {git, "https://github.com/AntidoteDB/riak_core", {tag, "riak_core_antidote_v1"}}},
     % ranch socket acceptor pool for managing protocol buffer sockets
-    ranch,
+    {ranch, "1.7.1"},
 
     %% efficient inter-dc messaging
     {erlzmq, {git, "https://github.com/zeromq/erlzmq2", {ref, "573d583"}}},
@@ -54,18 +52,8 @@
 ]}.
 
 {overrides, [
-    {override, riak_ensemble,
-        [{erl_opts, [
-            debug_info,
-            warn_untyped_record,
-            {platform_define, "^[0-9]+", namespaced_types},
-            {parse_transform, lager_transform}
-        ]},
-            {plugins, [pc]},
-            {provider_hooks, [{post, [{compile, {pc, compile}}, {clean, {pc, clean}}]}]}
-        ]},
     {override, riak_core,
-        [{erl_opts, [{parse_transform, lager_transform}, debug_info, warn_untyped_record,
+        [{erl_opts, [debug_info, warn_untyped_record,
             {plugins, [pc]},
             {platform_define, "18", old_rand},
             {platform_define, "17", old_rand},
@@ -118,11 +106,7 @@
     {overlay, [
         {mkdir, "data/ring"},
         {copy, "bin/env", "bin/env"},
-        {template, "rel/files/antidote-admin", "bin/antidote-admin"},
-        {template, "_build/default/lib/cuttlefish/priv/erlang_vm.schema", "lib/11-erlang_vm.schema"},
-        {template, "_build/default/lib/riak_core/priv/riak_core.schema", "lib/12-riak_core.schema"},
-        {template, "_build/default/lib/riak_sysmon/priv/riak_sysmon.schema", "lib/15-riak_sysmon.schema"},
-        {template, "_build/default/lib/eleveldb/priv/eleveldb.schema", "lib/21-leveldb.schema"}
+        {template, "rel/files/antidote-admin", "bin/antidote-admin"}
     ]},
     {overlay_vars, "config/vars.config"},
     {extended_start_script, true}

diff --git a/rebar.lock b/rebar.lock
@@ -4,40 +4,28 @@
  {<<"antidote_pb_codec">>,{pkg,<<"antidote_pb_codec">>,<<"0.1.1">>},0},
  {<<"antidotec_pb">>,{pkg,<<"antidotec_pb">>,<<"0.2.8">>},0},
  {<<"basho_stats">>,{pkg,<<"basho_stats">>,<<"1.0.3">>},1},
- {<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},2},
  {<<"blume">>,{pkg,<<"blume">>,<<"0.1.1">>},1},
  {<<"chash">>,{pkg,<<"chash">>,<<"0.1.2">>},1},
- {<<"clique">>,{pkg,<<"clique">>,<<"0.3.12">>},1},
- {<<"cuttlefish">>,{pkg,<<"cuttlefish">>,<<"2.1.4">>},1},
  {<<"eleveldb">>,{pkg,<<"eleveldb">>,<<"2.2.20">>},1},
  {<<"elli">>,{pkg,<<"elli">>,<<"3.2.0">>},0},
  {<<"elli_prometheus">>,{pkg,<<"elli_prometheus">>,<<"0.1.1">>},0},
  {<<"erlzmq">>,
   {git,"https://github.com/zeromq/erlzmq2",
        {ref,"573d583930c4b1134e504bec83926d188112b401"}},
   0},
- {<<"exometer_core">>,{pkg,<<"basho_exometer_core">>,<<"1.0.5">>},1},
- {<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.8">>},1},
  {<<"gen_fsm_compat">>,{pkg,<<"gen_fsm_compat">>,<<"0.3.0">>},1},
- {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},2},
- {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
- {<<"lager">>,
-  {git,"https://github.com/erlang-lager/lager",
-       {ref,"411edc71ee9823f6ab9c6f617daccce3c6798a29"}},
-  0},
- {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},2},
  {<<"pbkdf2">>,{pkg,<<"pbkdf2">>,<<"2.0.0">>},1},
- {<<"poolboy">>,{pkg,<<"basho_poolboy">>,<<"0.8.4">>},1},
+ {<<"poolboy">>,{pkg,<<"poolboy">>,<<"1.5.2">>},1},
  {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.4.1">>},0},
  {<<"prometheus_process_collector">>,
   {pkg,<<"prometheus_process_collector">>,<<"1.4.3">>},
   0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.7.1">>},0},
  {<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.3">>},0},
- {<<"riak_core">>,{pkg,<<"riak_core_ng">>,<<"3.1.1">>},0},
- {<<"riak_ensemble">>,{pkg,<<"riak_ensemble_ng">>,<<"2.4.4">>},1},
- {<<"riak_sysmon">>,{pkg,<<"riak_sysmon">>,<<"2.1.7">>},1},
- {<<"setup">>,{pkg,<<"setup">>,<<"2.0.2">>},2},
+ {<<"riak_core">>,
+  {git,"https://github.com/AntidoteDB/riak_core",
+       {ref,"a26124d4e9b10a12a7a55e8a94a9df2b3704a1dc"}},
+  0},
  {<<"vectorclock">>,{pkg,<<"vectorclock">>,<<"0.2.0">>},0}]}.
 [
 {pkg_hash,[
@@ -46,29 +34,17 @@
  {<<"antidote_pb_codec">>, <<"29891F77FB5DC8240495C425160EA152E9CA5753B7137E1866D9BA279F0F997B">>},
  {<<"antidotec_pb">>, <<"70350652AE269BC561DA6DCC54DB6A1CFF203E01686E735C1341EFD925DEE598">>},
  {<<"basho_stats">>, <<"7E1174151509C64FCC1934120ED32295E14F84DAAE7F84926BA2C8D3700D146C">>},
- {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
  {<<"blume">>, <<"CFB4F43688690BA81C6A79F54E4678CFD5FDEDAB692F277AE740AE4A3897360D">>},
  {<<"chash">>, <<"AF02484F2640C653C4B9A8557A14CA0704989DBEDB27E7CCBC442F1903A3BCA7">>},
- {<<"clique">>, <<"3D8D5CA3C60787AD13562BEA18D34149BA8915AD08214EDE91D50657198B4DC3">>},
- {<<"cuttlefish">>, <<"1DFF2DA7BBB67B4EF887CDA643FB112231EA08706220D34C38CB8FE25EED7F6E">>},
  {<<"eleveldb">>, <<"1FFF63A5055BBF4BF821F797EF76065882B193F5E8095F95FCD9287187773B58">>},
  {<<"elli">>, <<"7842861819869EBBFF7230BC77ECF2DF551AE3EAEF5FDE6B01A7561CACCB811E">>},
  {<<"elli_prometheus">>, <<"FF41EA8D88D1EBD1CD7A6D43FCC02B33B47FF20272C097B9D3A3CCCD79980C05">>},
- {<<"exometer_core">>, <<"8B37B9B07815B964E67C8D789D823B57E10DAF375EC146016527AECFC13D03C7">>},
- {<<"folsom">>, <<"9A2B02010F6727CB1948EF34E21CB66F3554B63355C3A31E8BCB10FB172C3170">>},
  {<<"gen_fsm_compat">>, <<"5903549F67D595F58A7101154CBE0FDD46955FBFBE40813F1E53C23A970FF5F4">>},
- {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
- {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
  {<<"pbkdf2">>, <<"11C23279FDED5C0027AB3996CFAE77805521D7EF4BABDE2BD7EC04A9086CF499">>},
- {<<"poolboy">>, <<"45C306FF1C9F6451730DD21642EDF55FA72EBD5E2FE4A38D8D8A56B8EA21A256">>},
+ {<<"poolboy">>, <<"392B007A1693A64540CEAD79830443ABF5762F5D30CF50BC95CB2C1AAAFA006B">>},
  {<<"prometheus">>, <<"1E96073B3ED7788053768FEA779CBC896DDC3BDD9BA60687F2AD50B252AC87D6">>},
  {<<"prometheus_process_collector">>, <<"657386E8F142FC817347D95C1F3A05AB08710F7DF9E7F86DB6FACAED107ED929">>},
  {<<"ranch">>, <<"6B1FAB51B49196860B733A49C07604465A47BDB78AA10C1C16A3D199F7F8C881">>},
  {<<"rand_compat">>, <<"011646BC1F0B0C432FE101B816F25B9BBB74A085713CEE1DAFD2D62E9415EAD3">>},
- {<<"riak_core">>, <<"098CEEF293F9F232E724DD8745916F2E4CE0F14CB8EDD1653E8425A14F0DD0B6">>},
- {<<"riak_ensemble">>, <<"F9E04052F4A7FAAD20F008DFF18D34D3552513000410CE9C5941B4F7361741E8">>},
- {<<"riak_sysmon">>, <<"AF420DF0F7569E1F12BCD465745164CB6189EB93F118D5CDB3F90FEB3F8BF47D">>},
- {<<"setup">>, <<"1203F4CDA11306C2E34434244576DED0A7BBFB0908D9A572356C809BD0CDF085">>},
  {<<"vectorclock">>, <<"6C4A9D44895F51BB99910DBE31FC691BF05FA6B2BF84986F6E3BDE4BD18F6CBA">>}]}
 ].
diff --git a/src/antidote.app.src b/src/antidote.app.src
@@ -8,7 +8,6 @@
                   kernel,
                   stdlib,
                   riak_core,
-                  cuttlefish,
                   erlzmq,
                   rand_compat,
                   runtime_tools,