From f7c0cbe5cd1f1f204910d07fea9dc0fe86abf400 Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Sun, 15 Jul 2018 16:09:03 +0300
Subject: [PATCH] update deps and move one vendor to our organisation for
 making a new branch in order to solve this:
 https://github.com/kataras/iris/issues/1040, although it's not ours
 problem...

Former-commit-id: 6013525d2aabc35461bf24871e3b36ca91004fb9
---
 Gopkg.lock                                  | 6 +++---
 Gopkg.toml                                  | 6 +++---
 _examples/tutorial/url-shortener/factory.go | 3 ++-
 core/errors/errors.go                       | 2 +-
 sessions/config.go                          | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 443278da..de54310a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -116,7 +116,7 @@
   revision = "825e39f34365e7db2c9fbc3692c16220e3bd7418"
 
 [[projects]]
-  branch = "master"
+  branch = "v2"
   name = "github.com/kataras/survey"
   packages = [".","terminal","core"]
   revision = "00934ae069eda15df26fa427ac393e67e239380c"
@@ -170,8 +170,8 @@
   revision = "abc90934186a77966e2beeac62ed966aac0561d5"
 
 [[projects]]
-  branch = "master"
-  name = "github.com/satori/go.uuid"
+  branch = "v2"
+  name = "github.com/iris-contrib/go.uuid"
   packages = ["."]
   revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"
 
diff --git a/Gopkg.toml b/Gopkg.toml
index e3aa9893..41b80165 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -43,7 +43,7 @@
   name = "github.com/kataras/golog"
 
 [[constraint]]
-  branch = "master"
+  branch = "v2"
   name = "github.com/kataras/survey"
 
 [[constraint]]
@@ -63,8 +63,8 @@
   name = "github.com/ryanuber/columnize"
 
 [[constraint]]
-  branch = "master"
-  name = "github.com/satori/go.uuid"
+  branch = "v2"
+  name = "github.com/iris-contrib/go.uuid"
 
 [[constraint]]
   branch = "master"
diff --git a/_examples/tutorial/url-shortener/factory.go b/_examples/tutorial/url-shortener/factory.go
index 78fe63a9..9df9ae95 100644
--- a/_examples/tutorial/url-shortener/factory.go
+++ b/_examples/tutorial/url-shortener/factory.go
@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/satori/go.uuid"
 	"net/url"
+
+	"github.com/satori/go.uuid"
 )
 
 // Generator the type to generate keys(short urls)
diff --git a/core/errors/errors.go b/core/errors/errors.go
index 01c8c2cd..c0369693 100644
--- a/core/errors/errors.go
+++ b/core/errors/errors.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/satori/go.uuid"
+	"github.com/iris-contrib/go.uuid"
 )
 
 var (
diff --git a/sessions/config.go b/sessions/config.go
index d126e408..018ec139 100644
--- a/sessions/config.go
+++ b/sessions/config.go
@@ -3,7 +3,7 @@ package sessions
 import (
 	"time"
 
-	"github.com/satori/go.uuid"
+	"github.com/iris-contrib/go.uuid"
 )
 
 const (