Update to rebar3

Author: hanssv

.gitignore

@@ -1,4 +1,3 @@
-deps
 ebin
 log
 riak_test
@@ -23,4 +22,5 @@ dialyzer_unhandled_warnings
 dialyzer_warnings
 .idea
 riak_test.iml
-
+_build/
+rebar.lock

Makefile

@@ -7,50 +7,34 @@ APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
 	observer wx gs
 PLT = $(HOME)/.riak-test_dialyzer_plt
 
+REBAR=./rebar3
+
 all: deps compile
-	./rebar skip_deps=true escriptize
-	SMOKE_TEST=1 ./rebar skip_deps=true escriptize
+	$(REBAR) skip_deps=true escriptize
+	SMOKE_TEST=1 $(REBAR) skip_deps=true escriptize
 
 deps:
 	$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the locked-deps target"))
-	./rebar get-deps
+	$(REBAR) get-deps
 
 docsclean:
 	@rm -rf doc/*.png doc/*.html doc/*.css edoc-info
 
 compile: deps
-	./rebar compile
+	$(REBAR) compile
 
 clean:
-	@./rebar clean
+	@$(REBAR) clean
 
 distclean: clean
 	@rm -rf riak_test deps
 
 quickbuild:
-	./rebar skip_deps=true compile
-	./rebar escriptize
-
-##
-## Lock Targets
-##
-##  see https://github.com/seth/rebar_lock_deps_plugin
-lock: deps compile
-	./rebar lock-deps
-
-locked-all: locked-deps compile
-
-locked-deps:
-	@echo "Using rebar.config.lock file to fetch dependencies"
-	./rebar -C rebar.config.lock get-deps
+	$(REBAR) skip_deps=true compile
+	$(REBAR) escriptize
 
 ##################
 # Dialyzer targets
 ##################
 
-# Legacy target left for compatibility with any existing automation
-# scripts ...
-clean_plt:
-	cleanplt
-
 include tools.mk

rebar

@@ -1,4 +1,4 @@
-{require_otp_vsn, "R13B04|R14|R15|R16"}.
+{require_otp_vsn, "R16|17|18|19|20"}.
 {cover_enabled, true}.
 {edoc_opts, [{preprocess, true}]}.
 %%{edoc_opts, [{doclet, edown_doclet}, {pretty_printer, erl_pp}]}.
@@ -11,23 +11,24 @@
 {eunit_opts, [verbose]}.
 
 {deps, [
+        gen_fsm_compat,
         {lager, ".*", {git, "git://github.com/basho/lager", {tag, "3.2.1"}}},
         {getopt, ".*", {git, "git://github.com/jcomellas/getopt", {tag, "v0.4"}}},
         {meck, "0.8.2", {git, "git://github.com/basho/meck.git", {tag, "0.8.2"}}},
         {mapred_verify, ".*", {git, "git://github.com/basho/mapred_verify", {branch, "master"}}},
-        {riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {tag, "2.5.5"}}},
-        {riakhttpc, ".*", {git, "git://github.com/nhs-riak/riak-erlang-http-client", {branch, "develop-2.2"}}},
-        {kvc, "1.3.0", {git, "https://github.com/etrepum/kvc", {tag, "v1.3.0"}}},
+        {riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-3.0"}}},
+        {riakhttpc, ".*", {git, "git://github.com/basho/riak-erlang-http-client", {branch, "develop-3.0"}}},
+        {kvc, "1.7.0", {git, "https://github.com/etrepum/kvc", {tag, "v1.7.0"}}},
         {druuid, ".*", {git, "git://github.com/kellymclaughlin/druuid.git", {tag, "0.2"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}},
         {kv_index_tictactree, ".*", {git, "https://github.com/martinsumner/kv_index_tictactree.git", {branch, "master"}}}
        ]}.
 
 {escript_incl_apps, [goldrush, lager, getopt, riakhttpc, riakc, ibrowse, mochiweb, kvc, kv_index_tictactree]}.
 {escript_emu_args, "%%! -escript main riak_test_escript +K true +P 10000 -env ERL_MAX_PORTS 10000\n"}.
-{plugin_dir, "src"}.
-{plugins, [rebar_riak_test_plugin, rebar_lock_deps_plugin]}.
-{riak_test, [
-    {test_paths, ["tests", "perf"]},
-    {test_output, "ebin"}
-]}.
+%% {plugin_dir, "src"}.
+%% {plugins, [rebar_riak_test_plugin]}.
+%% {riak_test, [
+%%    {test_paths, ["tests", "perf"]},
+%%    {test_output, "ebin"}
+%% ]}.