remove any micro v2 occurences from the project

This commit is contained in:
A.Unger
2021-02-18 08:01:53 +00:00
committed by Jörn Friedrich Dreyer
parent 54c4331479
commit 7e505fbd9f
19 changed files with 143 additions and 52 deletions
+5 -10
View File
@@ -4,17 +4,12 @@ import (
"os"
"strings"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/micro/go-micro/v2"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis/pkg/config"
"github.com/owncloud/ocis/ocis/pkg/flagset"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/owncloud/ocis/ocis/pkg/runtime"
"github.com/owncloud/ocis/ocis/pkg/version"
"github.com/spf13/viper"
)
@@ -49,13 +44,13 @@ func Execute() error {
)
}
r := *registry.GetRegistry()
//r := *registry.GetRegistry()
opts := micro.Options{
Registry: r,
}
//opts := micro.Options{
// Registry: r,
//}
runtime.AddMicroPlatform(app, opts)
//runtime.AddMicroPlatform(app, opts)
cli.HelpFlag = &cli.BoolFlag{
Name: "help,h",
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
mreg "github.com/asim/go-micro/v3/registry"
"github.com/micro/cli/v2"
mreg "github.com/micro/go-micro/v2/registry"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis/pkg/config"