From 4571b3b71c0d377d68c0d30b507cbc3cf8dc4c98 Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Tue, 7 Sep 2021 17:47:26 +0200
Subject: [PATCH] [MM-38075] Update server dependency (#158)

---
 build/go.mod | 2 +-
 build/go.sum | 4 ++--
 go.mod       | 2 +-
 go.sum       | 4 ++--
 plugin.go    | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/go.mod b/build/go.mod
index eeb70ec..8272830 100644
--- a/build/go.mod
+++ b/build/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/go-git/go-git/v5 v5.1.0
-	github.com/mattermost/mattermost-server/v6 v6.0.0-20210823094503-ddaa07e35fa7
+	github.com/mattermost/mattermost-server/v6 v6.0.0-20210906125346-b41b7eae1026
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.0
 	sigs.k8s.io/yaml v1.2.0
diff --git a/build/go.sum b/build/go.sum
index 492e58a..e71ce5a 100644
--- a/build/go.sum
+++ b/build/go.sum
@@ -569,8 +569,8 @@ github.com/mattermost/logr v1.0.13 h1:6F/fM3csvH6Oy5sUpJuW7YyZSzZZAhJm5VcgKMxA2P
 github.com/mattermost/logr v1.0.13/go.mod h1:Mt4DPu1NXMe6JxPdwCC0XBoxXmN9eXOIRPoZarU2PXs=
 github.com/mattermost/logr/v2 v2.0.10 h1:i6rJbuX/EkBM9maM8M0eJ3rxB+fsBKNslPvzSlA2w/M=
 github.com/mattermost/logr/v2 v2.0.10/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXpNh0k/y8Hmwg=
-github.com/mattermost/mattermost-server/v6 v6.0.0-20210823094503-ddaa07e35fa7 h1:/OJoZCSHknXtP9NYKcfdi1Hjsyup025hhPxp4Paz76Q=
-github.com/mattermost/mattermost-server/v6 v6.0.0-20210823094503-ddaa07e35fa7/go.mod h1:+S8CsNEPv1FOl1usaPBQ6Gu9+Sm1Cc9YdU/Qh1YMGVI=
+github.com/mattermost/mattermost-server/v6 v6.0.0-20210906125346-b41b7eae1026 h1:hKyzC42BwH6rUscKSXRG0R4EhDJPL12+s6Rm3ZKnq34=
+github.com/mattermost/mattermost-server/v6 v6.0.0-20210906125346-b41b7eae1026/go.mod h1:kmxJuVgpX13Th+e5L1ZsBs4aq+ETmmDg9joo5r4cIw8=
 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0/go.mod h1:nV5bfVpT//+B1RPD2JvRnxbkLmJEYXmRaaVl15fsXjs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
diff --git a/go.mod b/go.mod
index 546874f..5bd79d4 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/mattermost/mattermost-plugin-starter-template
 go 1.16
 
 require (
-	github.com/mattermost/mattermost-server/v6 v6.0.0-20210823094503-ddaa07e35fa7
+	github.com/mattermost/mattermost-server/v6 v6.0.0-20210906125346-b41b7eae1026
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/go.sum b/go.sum
index e0835ab..7c70fa5 100644
--- a/go.sum
+++ b/go.sum
@@ -553,8 +553,8 @@ github.com/mattermost/logr v1.0.13 h1:6F/fM3csvH6Oy5sUpJuW7YyZSzZZAhJm5VcgKMxA2P
 github.com/mattermost/logr v1.0.13/go.mod h1:Mt4DPu1NXMe6JxPdwCC0XBoxXmN9eXOIRPoZarU2PXs=
 github.com/mattermost/logr/v2 v2.0.10 h1:i6rJbuX/EkBM9maM8M0eJ3rxB+fsBKNslPvzSlA2w/M=
 github.com/mattermost/logr/v2 v2.0.10/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXpNh0k/y8Hmwg=
-github.com/mattermost/mattermost-server/v6 v6.0.0-20210823094503-ddaa07e35fa7 h1:/OJoZCSHknXtP9NYKcfdi1Hjsyup025hhPxp4Paz76Q=
-github.com/mattermost/mattermost-server/v6 v6.0.0-20210823094503-ddaa07e35fa7/go.mod h1:+S8CsNEPv1FOl1usaPBQ6Gu9+Sm1Cc9YdU/Qh1YMGVI=
+github.com/mattermost/mattermost-server/v6 v6.0.0-20210906125346-b41b7eae1026 h1:hKyzC42BwH6rUscKSXRG0R4EhDJPL12+s6Rm3ZKnq34=
+github.com/mattermost/mattermost-server/v6 v6.0.0-20210906125346-b41b7eae1026/go.mod h1:kmxJuVgpX13Th+e5L1ZsBs4aq+ETmmDg9joo5r4cIw8=
 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0/go.mod h1:nV5bfVpT//+B1RPD2JvRnxbkLmJEYXmRaaVl15fsXjs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
diff --git a/plugin.go b/plugin.go
index 594fda2..6d29775 100644
--- a/plugin.go
+++ b/plugin.go
@@ -2,6 +2,7 @@ package root
 
 import (
 	_ "embed" // Need to embed manifest file
+	"encoding/json"
 	"strings"
 
 	"github.com/mattermost/mattermost-server/v6/model"
@@ -13,5 +14,5 @@ var manifestString string
 var Manifest model.Manifest
 
 func init() {
-	Manifest = *model.ManifestFromJson(strings.NewReader(manifestString))
+	_ = json.NewDecoder(strings.NewReader(manifestString)).Decode(&Manifest)
 }