otp20 fixes.

Author: Martin Cox

.gitignore

@@ -1,3 +1,4 @@
+_build/
 ebin/
 deps/
 tests/

rebar

@@ -4,7 +4,7 @@
 %% katja: Defines a function `query()`, which is a reserved word in R15
 %% uuid: Dep on quickrand
 %% quickrand: Bogus (IMHO) inability to adapt to R15 environment.
-{require_otp_vsn, "R16|17|18"}.
+{require_otp_vsn, "20"}.
 
 {deps,
  [
@@ -15,53 +15,31 @@
   %%       increments.  If someone wants to take advantage of a
   %%       new folsom feature, that desire + float incr must be
   %%       weighed.
-  {node_package, "2.0.*", {git, "git://github.com/basho/node_package", {tag, "2.0.0"}}},
-  {folsom, ".*", {git, "git://github.com/basho/folsom.git", {branch, "boundary-0.7.1+basho-bench-float"}}},
-  {lager, "2.*", {git, "git://github.com/basho/lager", {tag, "2.1.0"}}},
+  {folsom, "0.8.7"},
+  {lager, "2.*", {git, "git://github.com/erlang-lager/lager", {tag, "3.8.0"}}},
   {ibrowse, ".*",
-   {git, "git://github.com/cmullaparthi/ibrowse.git", {tag, "v4.0.2"}}},
+   {git, "git://github.com/basho/ibrowse.git", {branch, "develop-3.0"}}},
   {riakc, ".*",
-   {git, "git://github.com/basho/riak-erlang-client", {branch, "master"}}},
+   {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-3.0"}}},
   {mochiweb, "2.9.*",
-   {git, "git://github.com/basho/mochiweb", {tag, "v2.9.0"}}},
+   {git, "git://github.com/mochi/mochiweb", {tag, "v2.9.0"}}},
   {getopt, ".*",
-   {git, "git://github.com/jcomellas/getopt", {tag, "v0.8.2"}}},
-
-  {casbench, "0.1",
-   {git, "git://github.com/basho/casbench",
-    "95ed55b494551577870984aeb1e0f683631a326f"}},
-  %% A commit to the cqerl repo in 2015-02 added a dependency on a package
-  %% called 're2', which causes additional compilation dependencies for
-  %% the entire basho_bench package.  Use a commit that's most recent
-  %% but prior to the introduction of 're2'.
-  {cqerl, ".*",
-   {git, "git://github.com/matehat/cqerl.git",
-   "16021593c866ca314acd0ba6858194ed44a362b3"}},
-  {katja, ".*",
-   {git, "git://github.com/nifoc/katja.git",
-   {branch, "master"}}},
-  {rebar_lock_deps_plugin, ".*", {git, "git://github.com/seth/rebar_lock_deps_plugin.git", {tag, "3.1.0"}}}
+   {git, "git://github.com/jcomellas/getopt", {tag, "v0.8.2"}}}
  ]}.
 
 {erl_opts, [{src_dirs, [src]},
            {parse_transform, lager_transform}]}.
 
-{plugins, [rebar_lock_deps_plugin]}.
-
 {escript_incl_apps, [
     bear,
-    casbench,
-    cqerl,
     folsom,
     getopt,
     goldrush,
     ibrowse,
-    katja,
     lager,
     lz4,
     %% meck,
     mochiweb,
-    node_package,
     %% proper,
     protobuffs,
     riak_pb,

rebar.config

@@ -0,0 +1,34 @@
+{"1.1.0",
+[{<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},1},
+ {<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.7">>},0},
+ {<<"getopt">>,
+  {git,"git://github.com/jcomellas/getopt",
+       {ref,"388dc95caa7fb97ec7db8cfc39246a36aba61bd8"}},
+  0},
+ {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
+ {<<"ibrowse">>,
+  {git,"git://github.com/basho/ibrowse.git",
+       {ref,"893864e25573b4ccd31a82b9412639751733ba40"}},
+  0},
+ {<<"lager">>,
+  {git,"git://github.com/erlang-lager/lager",
+       {ref,"22e62f28e5afabe90a6f31bcde367a2b5799fc94"}},
+  0},
+ {<<"mochiweb">>,
+  {git,"git://github.com/mochi/mochiweb",
+       {ref,"9090c7942f9dcde4ddbf9f78429e289ff5600c18"}},
+  0},
+ {<<"riak_pb">>,
+  {git,"https://github.com/basho/riak_pb",
+       {ref,"55fab3a2642edf2293228d5a43748a0fc3c8e554"}},
+  1},
+ {<<"riakc">>,
+  {git,"git://github.com/basho/riak-erlang-client",
+       {ref,"1bc4e86f2969d7dd8dd05362ea00817435579a0a"}},
+  0}]}.
+[
+{pkg_hash,[
+ {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
+ {<<"folsom">>, <<"A885F0AEEE4C84270954C88A55A5A473D6B2C7493E32FFDC5765412DD555A951">>},
+ {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>}]}
+].

rebar.config.lock

@@ -347,8 +347,4 @@ distribute_app(App) ->
 %% just a utility, should be in basho_bench_utils.erl
 %% but 's' is for multiple utilities, and so far this
 %% is the only one.
--ifdef(new_hash).
 md5(Bin) -> crypto:hash(md5, Bin).
--else.
-md5(Bin) -> crypto:md5(Bin).
--endif.