From 923030cf443be3018505766a555b55fe6a4dcb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Szol=C3=A1r?= <r@richardszolar.me>
Date: Wed, 19 Aug 2020 18:38:43 +0200
Subject: [PATCH] Update "github.com/go-yaml/yaml" import path to
 "gopkg.in/yaml.v2" as recommended per the project's documentation

---
 api/plugin.go      | 2 +-
 api/plugin_test.go | 2 +-
 go.mod             | 2 +-
 go.sum             | 4 ----
 plugin/manager.go  | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/api/plugin.go b/api/plugin.go
index 477793d..80285e7 100644
--- a/api/plugin.go
+++ b/api/plugin.go
@@ -8,11 +8,11 @@ import (
 	"github.com/gotify/location"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-yaml/yaml"
 	"github.com/gotify/server/v2/auth"
 	"github.com/gotify/server/v2/model"
 	"github.com/gotify/server/v2/plugin"
 	"github.com/gotify/server/v2/plugin/compat"
+	"gopkg.in/yaml.v2"
 )
 
 // The PluginDatabase interface for encapsulating database access.
diff --git a/api/plugin_test.go b/api/plugin_test.go
index 624302c..836faa4 100644
--- a/api/plugin_test.go
+++ b/api/plugin_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/go-yaml/yaml"
+	"gopkg.in/yaml.v2"
 
 	"github.com/gotify/server/v2/mode"
 	"github.com/gotify/server/v2/model"
diff --git a/go.mod b/go.mod
index 96c65d2..95c837d 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/gin-contrib/gzip v0.0.1
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-playground/validator/v10 v10.2.0
-	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/gobuffalo/envy v1.9.0 // indirect
 	github.com/gobuffalo/logger v1.0.3 // indirect
 	github.com/gobuffalo/packd v1.0.0 // indirect
@@ -26,6 +25,7 @@ require (
 	github.com/stretchr/testify v1.5.1
 	golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
 	golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
+	gopkg.in/yaml.v2 v2.2.8
 )
 
 go 1.14
diff --git a/go.sum b/go.sum
index 0163347..c66e5ff 100644
--- a/go.sum
+++ b/go.sum
@@ -7,8 +7,6 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/Southclaws/configor v1.0.0 h1:0bt6XsYs0q3GlK1gOqdjoM4VJj9ePdd/GcNNjzH567A=
-github.com/Southclaws/configor v1.0.0/go.mod h1:LVoYKxkifbFIINnnXwmqeiH4ciRalQNDMwQETyFomTs=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -114,8 +112,6 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gotify/configor v1.0.2-0.20190112111140-7d9c7c7e6233 h1:ZFYA2/LqyzFP2TunWDdU2XhmmQOSG2JL5aPvLOo6IPQ=
-github.com/gotify/configor v1.0.2-0.20190112111140-7d9c7c7e6233/go.mod h1:Sclq5yNfX/DJHu0TR2k0+Hi34YxsuKTacgrY3z83HoU=
 github.com/gotify/configor v1.0.2 h1:8uZKz6TpSup2dJKib8wz95KppQNtRMCmIl+eFY5uw+A=
 github.com/gotify/configor v1.0.2/go.mod h1:bxVAr7YmnLR8cGik/M9ROkytPzr521/IwM5zLOfkHwk=
 github.com/gotify/location v0.0.0-20170722210143-03bc4ad20437 h1:4qMhogAexRcnvdoY9O1RoCuuuNEhDF25jtbGIWPtcms=
diff --git a/plugin/manager.go b/plugin/manager.go
index eca9b42..8d2c611 100644
--- a/plugin/manager.go
+++ b/plugin/manager.go
@@ -15,10 +15,10 @@ import (
 	"sync"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-yaml/yaml"
 	"github.com/gotify/server/v2/auth"
 	"github.com/gotify/server/v2/model"
 	"github.com/gotify/server/v2/plugin/compat"
+	"gopkg.in/yaml.v2"
 )
 
 // The Database interface for encapsulating database access.