Merge branch 'master' into go-embed

ocis/pkg/command/version.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	mreg "github.com/asim/go-micro/v3/registry"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
+	mreg "go-micro.dev/v4/registry"
 )
 
 // VersionCommand is the entrypoint for the version command.

ocis/pkg/runtime/service/service.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	mzlog "github.com/asim/go-micro/plugins/logger/zerolog/v3"
-	"github.com/asim/go-micro/v3/logger"
 	"github.com/mohae/deepcopy"
 	"github.com/olekukonko/tablewriter"
 	accounts "github.com/owncloud/ocis/accounts/pkg/command"
@@ -35,6 +34,7 @@ import (
 	webdav "github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"
+	"go-micro.dev/v4/logger"
 )
 
 var (