From 0c7fc275df65696a3c7de6c151998f7ffb1f7b12 Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Fri, 8 Feb 2019 11:22:30 +0000
Subject: [PATCH 1/5] Switch to public webmachine

To try and avoid needing to re-do the webmachine/mochiweb options passing
---
 rebar.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index 4c12f0b..b278d68 100644
--- a/rebar.config
+++ b/rebar.config
@@ -3,8 +3,8 @@
 {eunit_opts, [verbose]}.
 {deps, [
         {riak_pb, "2.2.*", {git, "git://github.com/basho/riak_pb.git", {branch, "develop-2.2.5"}}},
-        {webmachine, "1.10.8", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.8-basho1"}}},
-        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.2.5"}}}
+        {webmachine, "1.11.*", {git, "git://github.com/webmachine/webmachine.git", {tag, "1.11.1"}}},
+        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.9"}}}
         ]}.
 
 {xref_checks, [undefined_function_calls]}.

From 7d301c47ae61d474be4ee3ef31fee246f6aa84f9 Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Fri, 8 Feb 2019 17:20:14 +0000
Subject: [PATCH 2/5] Revert "Switch to public webmachine"

This reverts commit 0c7fc275df65696a3c7de6c151998f7ffb1f7b12.
---
 rebar.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index b278d68..4c12f0b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -3,8 +3,8 @@
 {eunit_opts, [verbose]}.
 {deps, [
         {riak_pb, "2.2.*", {git, "git://github.com/basho/riak_pb.git", {branch, "develop-2.2.5"}}},
-        {webmachine, "1.11.*", {git, "git://github.com/webmachine/webmachine.git", {tag, "1.11.1"}}},
-        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.9"}}}
+        {webmachine, "1.10.8", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.8-basho1"}}},
+        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.2.5"}}}
         ]}.
 
 {xref_checks, [undefined_function_calls]}.

From 4efd8b147db5c859a6a2a698a7c16ae002e0b405 Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Fri, 8 Feb 2019 17:32:22 +0000
Subject: [PATCH 3/5] Update rebar.config

Switch to develop-2.9
---
 rebar.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index 4c12f0b..e3907e8 100644
--- a/rebar.config
+++ b/rebar.config
@@ -3,8 +3,8 @@
 {eunit_opts, [verbose]}.
 {deps, [
         {riak_pb, "2.2.*", {git, "git://github.com/basho/riak_pb.git", {branch, "develop-2.2.5"}}},
-        {webmachine, "1.10.8", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.8-basho1"}}},
-        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.2.5"}}}
+        {webmachine, ".*", {git, "git://github.com/martinsumner/webmachine.git", {branch, "develop-2.9"}}},
+        {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.9"}}}
         ]}.
 
 {xref_checks, [undefined_function_calls]}.

From bed7707184fce8e8477e4ded5b49d6df7bc896b2 Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Fri, 8 Feb 2019 17:48:57 +0000
Subject: [PATCH 4/5] Update rebar.config

Point at develop-2.9, which includes the obect touch work
---
 rebar.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config b/rebar.config
index e3907e8..cdac995 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
 {erl_opts, [warnings_as_errors, {parse_transform, lager_transform}]}.
 {eunit_opts, [verbose]}.
 {deps, [
-        {riak_pb, "2.2.*", {git, "git://github.com/basho/riak_pb.git", {branch, "develop-2.2.5"}}},
+        {riak_pb, ".*", {git, "git://github.com/martinsumner/riak_pb.git", {branch, "develop-2.9"}}},
         {webmachine, ".*", {git, "git://github.com/martinsumner/webmachine.git", {branch, "develop-2.9"}}},
         {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.9"}}}
         ]}.

From 08f07e7ecd8a9c11329512502a7726c0b8363fdc Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Mon, 11 Feb 2019 11:55:13 +0000
Subject: [PATCH 5/5] Update rebar.config

Re-point back at basho repo (requires PRs to be merged in)
---
 rebar.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index cdac995..1bd42f2 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,8 +2,8 @@
 {erl_opts, [warnings_as_errors, {parse_transform, lager_transform}]}.
 {eunit_opts, [verbose]}.
 {deps, [
-        {riak_pb, ".*", {git, "git://github.com/martinsumner/riak_pb.git", {branch, "develop-2.9"}}},
-        {webmachine, ".*", {git, "git://github.com/martinsumner/webmachine.git", {branch, "develop-2.9"}}},
+        {riak_pb, ".*", {git, "git://github.com/basho/riak_pb.git", {branch, "develop-2.9"}}},
+        {webmachine, ".*", {git, "git://github.com/basho/webmachine.git", {branch, "develop-2.9"}}},
         {riak_core, ".*", {git, "git://github.com/basho/riak_core.git", {branch, "develop-2.9"}}}
         ]}.