From cbac7e005287657997df44dd99fedf0f4cd3272d Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Tue, 12 Oct 2021 17:48:48 +0200
Subject: [PATCH] update protobuf

---
 accounts/pkg/assets/embed.go                    | 4 ++--
 accounts/pkg/proto/v0/accounts.mock.go          | 2 +-
 accounts/pkg/proto/v0/accounts.pb.micro_test.go | 2 +-
 go.mod                                          | 2 +-
 idp/pkg/assets/embed.go                         | 4 ++--
 settings/pkg/assets/embed.go                    | 4 ++--
 settings/pkg/proto/v0/settings.mock.go          | 2 +-
 settings/pkg/store/filesystem/io.go             | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/accounts/pkg/assets/embed.go b/accounts/pkg/assets/embed.go
index 626074131..e5131039b 100644
--- a/accounts/pkg/assets/embed.go
+++ b/accounts/pkg/assets/embed.go
@@ -1,5 +1,5 @@
-// Code generated by fileb0x at "2021-10-12 17:36:18.580748006 +0200 CEST m=+0.012559814" from config file "embed.yml" DO NOT EDIT.
-// modification hash(226eaaaddf7234588fe37a44809e8297.8058aec596c5fb73022d09bb97af796e)
+// Code generated by fileb0x at "2021-10-12 17:46:40.683203658 +0200 CEST m=+0.024137900" from config file "embed.yml" DO NOT EDIT.
+// modification hash(26951c8f43728b863f6e40e546236bf2.8058aec596c5fb73022d09bb97af796e)
 
 package assets
 
diff --git a/accounts/pkg/proto/v0/accounts.mock.go b/accounts/pkg/proto/v0/accounts.mock.go
index b0c653f42..a11b49313 100644
--- a/accounts/pkg/proto/v0/accounts.mock.go
+++ b/accounts/pkg/proto/v0/accounts.mock.go
@@ -3,8 +3,8 @@ package proto
 import (
 	context "context"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	client "go-micro.dev/v4/client"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // MockAccountsService can be used to write tests
diff --git a/accounts/pkg/proto/v0/accounts.pb.micro_test.go b/accounts/pkg/proto/v0/accounts.pb.micro_test.go
index 345dddd6b..589c8db04 100644
--- a/accounts/pkg/proto/v0/accounts.pb.micro_test.go
+++ b/accounts/pkg/proto/v0/accounts.pb.micro_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	mgrpcc "github.com/asim/go-micro/plugins/client/grpc/v3"
+	empty "github.com/golang/protobuf/ptypes/empty"
 
-	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/owncloud/ocis/accounts/pkg/command"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
diff --git a/go.mod b/go.mod
index ad4e0ddd1..625d8ea34 100644
--- a/go.mod
+++ b/go.mod
@@ -27,6 +27,7 @@ require (
 	github.com/go-logr/logr v0.4.0
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
 	github.com/gofrs/uuid v4.0.0+incompatible
+	github.com/gogo/protobuf v1.3.2
 	github.com/golang-jwt/jwt/v4 v4.0.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/golang/protobuf v1.5.2
@@ -135,7 +136,6 @@ require (
 	github.com/go-logfmt/logfmt v0.5.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.1 // indirect
diff --git a/idp/pkg/assets/embed.go b/idp/pkg/assets/embed.go
index 6dafca772..a1d0ec3ad 100644
--- a/idp/pkg/assets/embed.go
+++ b/idp/pkg/assets/embed.go
@@ -1,5 +1,5 @@
-// Code generated by fileb0x at "2021-10-12 17:36:33.618053886 +0200 CEST m=+0.135603395" from config file "embed.yml" DO NOT EDIT.
-// modification hash(8b436bb536ea87bb698f52a9f2b89b57.0aa2d0b1f716f88218c5e95a9b958fea)
+// Code generated by fileb0x at "2021-10-12 17:46:57.972131127 +0200 CEST m=+0.163789241" from config file "embed.yml" DO NOT EDIT.
+// modification hash(80d5a633e35bbf9038fb102367d29603.0aa2d0b1f716f88218c5e95a9b958fea)
 
 package assets
 
diff --git a/settings/pkg/assets/embed.go b/settings/pkg/assets/embed.go
index de16dacc3..b88e9df88 100644
--- a/settings/pkg/assets/embed.go
+++ b/settings/pkg/assets/embed.go
@@ -1,5 +1,5 @@
-// Code generated by fileb0x at "2021-10-12 17:36:49.855388577 +0200 CEST m=+0.008409526" from config file "embed.yml" DO NOT EDIT.
-// modification hash(3551cadfe922514764accbccfb8d146c.8058aec596c5fb73022d09bb97af796e)
+// Code generated by fileb0x at "2021-10-12 17:47:14.181923061 +0200 CEST m=+0.016783274" from config file "embed.yml" DO NOT EDIT.
+// modification hash(81bed33f3b6ad718cd277501167d4487.8058aec596c5fb73022d09bb97af796e)
 
 package assets
 
diff --git a/settings/pkg/proto/v0/settings.mock.go b/settings/pkg/proto/v0/settings.mock.go
index b24b9ee31..5f836fcdf 100644
--- a/settings/pkg/proto/v0/settings.mock.go
+++ b/settings/pkg/proto/v0/settings.mock.go
@@ -3,7 +3,7 @@ package proto
 import (
 	"context"
 
-	"github.com/golang/protobuf/ptypes/empty"
+	empty "github.com/golang/protobuf/ptypes/empty"
 	"go-micro.dev/v4/client"
 )
 
diff --git a/settings/pkg/store/filesystem/io.go b/settings/pkg/store/filesystem/io.go
index ba5c61046..95ba87115 100644
--- a/settings/pkg/store/filesystem/io.go
+++ b/settings/pkg/store/filesystem/io.go
@@ -3,8 +3,8 @@ package store
 import (
 	"os"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
+	"github.com/gogo/protobuf/jsonpb"
+	"google.golang.org/protobuf/proto"
 )
 
 // Unmarshal file into record