fix import paths for v2 release

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

config/cmd/cmd.go

@@ -7,54 +7,54 @@ import (
 	"strings"
 	"time"
 
-	"github.com/micro/go-micro/broker"
-	"github.com/micro/go-micro/client"
-	"github.com/micro/go-micro/client/selector"
-	"github.com/micro/go-micro/debug/trace"
-	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/runtime"
-	"github.com/micro/go-micro/server"
-	"github.com/micro/go-micro/store"
-	"github.com/micro/go-micro/transport"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/broker"
+	"github.com/micro/go-micro/v2/client"
+	"github.com/micro/go-micro/v2/client/selector"
+	"github.com/micro/go-micro/v2/debug/trace"
+	"github.com/micro/go-micro/v2/registry"
+	"github.com/micro/go-micro/v2/runtime"
+	"github.com/micro/go-micro/v2/server"
+	"github.com/micro/go-micro/v2/store"
+	"github.com/micro/go-micro/v2/transport"
+	"github.com/micro/go-micro/v2/util/log"
 
 	// clients
-	cgrpc "github.com/micro/go-micro/client/grpc"
-	cmucp "github.com/micro/go-micro/client/mucp"
+	cgrpc "github.com/micro/go-micro/v2/client/grpc"
+	cmucp "github.com/micro/go-micro/v2/client/mucp"
 
 	// servers
 	"github.com/micro/cli/v2"
-	sgrpc "github.com/micro/go-micro/server/grpc"
-	smucp "github.com/micro/go-micro/server/mucp"
+	sgrpc "github.com/micro/go-micro/v2/server/grpc"
+	smucp "github.com/micro/go-micro/v2/server/mucp"
 
 	// brokers
-	"github.com/micro/go-micro/broker/memory"
-	"github.com/micro/go-micro/broker/nats"
-	brokerSrv "github.com/micro/go-micro/broker/service"
+	"github.com/micro/go-micro/v2/broker/memory"
+	"github.com/micro/go-micro/v2/broker/nats"
+	brokerSrv "github.com/micro/go-micro/v2/broker/service"
 
 	// registries
-	"github.com/micro/go-micro/registry/etcd"
-	kreg "github.com/micro/go-micro/registry/kubernetes"
-	"github.com/micro/go-micro/registry/mdns"
-	rmem "github.com/micro/go-micro/registry/memory"
-	regSrv "github.com/micro/go-micro/registry/service"
+	"github.com/micro/go-micro/v2/registry/etcd"
+	kreg "github.com/micro/go-micro/v2/registry/kubernetes"
+	"github.com/micro/go-micro/v2/registry/mdns"
+	rmem "github.com/micro/go-micro/v2/registry/memory"
+	regSrv "github.com/micro/go-micro/v2/registry/service"
 
 	// selectors
-	"github.com/micro/go-micro/client/selector/dns"
-	"github.com/micro/go-micro/client/selector/router"
-	"github.com/micro/go-micro/client/selector/static"
+	"github.com/micro/go-micro/v2/client/selector/dns"
+	"github.com/micro/go-micro/v2/client/selector/router"
+	"github.com/micro/go-micro/v2/client/selector/static"
 
 	// transports
-	thttp "github.com/micro/go-micro/transport/http"
-	tmem "github.com/micro/go-micro/transport/memory"
+	thttp "github.com/micro/go-micro/v2/transport/http"
+	tmem "github.com/micro/go-micro/v2/transport/memory"
 
 	// stores
-	memStore "github.com/micro/go-micro/store/memory"
-	svcStore "github.com/micro/go-micro/store/service"
+	memStore "github.com/micro/go-micro/v2/store/memory"
+	svcStore "github.com/micro/go-micro/v2/store/service"
 
 	// tracers
-	// jTracer "github.com/micro/go-micro/debug/trace/jaeger"
-	memTracer "github.com/micro/go-micro/debug/trace/memory"
+	// jTracer "github.com/micro/go-micro/v2/debug/trace/jaeger"
+	memTracer "github.com/micro/go-micro/v2/debug/trace/memory"
 )
 
 type Cmd interface {

config/cmd/options.go

@@ -3,15 +3,15 @@ package cmd
 import (
 	"context"
 
-	"github.com/micro/go-micro/broker"
-	"github.com/micro/go-micro/client"
-	"github.com/micro/go-micro/client/selector"
-	"github.com/micro/go-micro/debug/trace"
-	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/runtime"
-	"github.com/micro/go-micro/server"
-	"github.com/micro/go-micro/store"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/broker"
+	"github.com/micro/go-micro/v2/client"
+	"github.com/micro/go-micro/v2/client/selector"
+	"github.com/micro/go-micro/v2/debug/trace"
+	"github.com/micro/go-micro/v2/registry"
+	"github.com/micro/go-micro/v2/runtime"
+	"github.com/micro/go-micro/v2/server"
+	"github.com/micro/go-micro/v2/store"
+	"github.com/micro/go-micro/v2/transport"
 )
 
 type Options struct {

config/config.go

@@ -4,10 +4,10 @@ package config
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/loader"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/source"
-	"github.com/micro/go-micro/config/source/file"
+	"github.com/micro/go-micro/v2/config/loader"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/source"
+	"github.com/micro/go-micro/v2/config/source/file"
 )
 
 // Config is an interface abstraction for dynamic configuration

config/default.go

@@ -5,11 +5,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/config/loader"
-	"github.com/micro/go-micro/config/loader/memory"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/reader/json"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/loader"
+	"github.com/micro/go-micro/v2/config/loader/memory"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/reader/json"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type config struct {

config/default_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/micro/go-micro/config/source/env"
-	"github.com/micro/go-micro/config/source/file"
+	"github.com/micro/go-micro/v2/config/source/env"
+	"github.com/micro/go-micro/v2/config/source/file"
 )
 
 var (

config/encoder/hcl/hcl.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/hashicorp/hcl"
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 type hclEncoder struct{}

config/encoder/json/json.go

@@ -3,7 +3,7 @@ package json
 import (
 	"encoding/json"
 
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 type jsonEncoder struct{}

config/encoder/toml/toml.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 
 	"github.com/BurntSushi/toml"
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 type tomlEncoder struct{}

config/encoder/xml/xml.go

@@ -3,7 +3,7 @@ package xml
 import (
 	"encoding/xml"
 
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 type xmlEncoder struct{}

config/encoder/yaml/yaml.go

@@ -2,7 +2,7 @@ package yaml
 
 import (
 	"github.com/ghodss/yaml"
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 type yamlEncoder struct{}

config/loader/loader.go

@@ -4,8 +4,8 @@ package loader
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 // Loader manages loading sources

config/loader/memory/memory.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/config/loader"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/reader/json"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/loader"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/reader/json"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type memory struct {

config/loader/memory/options.go

@@ -1,9 +1,9 @@
 package memory
 
 import (
-	"github.com/micro/go-micro/config/loader"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/loader"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 // WithSource appends a source to list of sources

config/options.go

@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/micro/go-micro/config/loader"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/loader"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 // WithLoader sets the loader for manager config

config/reader/json/json.go

@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/imdario/mergo"
-	"github.com/micro/go-micro/config/encoder"
-	"github.com/micro/go-micro/config/encoder/json"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder/json"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type jsonReader struct {

config/reader/json/json_test.go

@@ -3,7 +3,7 @@ package json
 import (
 	"testing"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 func TestReader(t *testing.T) {

config/reader/json/values.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	simple "github.com/bitly/go-simplejson"
-	"github.com/micro/go-micro/config/reader"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/reader"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type jsonValues struct {

config/reader/json/values_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 func TestValues(t *testing.T) {

config/reader/options.go

@@ -1,12 +1,12 @@
 package reader
 
 import (
-	"github.com/micro/go-micro/config/encoder"
-	"github.com/micro/go-micro/config/encoder/hcl"
-	"github.com/micro/go-micro/config/encoder/json"
-	"github.com/micro/go-micro/config/encoder/toml"
-	"github.com/micro/go-micro/config/encoder/xml"
-	"github.com/micro/go-micro/config/encoder/yaml"
+	"github.com/micro/go-micro/v2/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder/hcl"
+	"github.com/micro/go-micro/v2/config/encoder/json"
+	"github.com/micro/go-micro/v2/config/encoder/toml"
+	"github.com/micro/go-micro/v2/config/encoder/xml"
+	"github.com/micro/go-micro/v2/config/encoder/yaml"
 )
 
 type Options struct {

config/reader/reader.go

@@ -4,7 +4,7 @@ package reader
 import (
 	"time"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 // Reader is an interface for merging changesets

config/source/cli/cli.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/imdario/mergo"
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/config/cmd"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/cmd"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type cliSource struct {

config/source/cli/cli_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/config/cmd"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/cmd"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 func test(t *testing.T, withContext bool) {

config/source/cli/options.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type contextKey struct{}

config/source/env/env.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/imdario/mergo"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 var (

config/source/env/env_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 func TestEnv_Read(t *testing.T) {

config/source/env/options.go

@@ -5,7 +5,7 @@ import (
 
 	"strings"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type strippedPrefixKey struct{}

config/source/env/watcher.go

@@ -1,7 +1,7 @@
 package env
 
 import (
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type watcher struct {

config/source/etcd/etcd.go

@@ -8,7 +8,7 @@ import (
 
 	cetcd "github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 // Currently a single etcd reader

config/source/etcd/options.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type addressKey struct{}

config/source/etcd/util.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/mvcc/mvccpb"
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 func makeEvMap(e encoder.Encoder, data map[string]interface{}, kv []*clientv3.Event, stripPrefix string) map[string]interface{} {

config/source/etcd/watcher.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	cetcd "github.com/coreos/etcd/clientv3"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type watcher struct {

config/source/file/file.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type file struct {

config/source/file/format.go

@@ -3,7 +3,7 @@ package file
 import (
 	"strings"
 
-	"github.com/micro/go-micro/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder"
 )
 
 func format(p string, e encoder.Encoder) string {

config/source/file/format_test.go

@@ -3,7 +3,7 @@ package file
 import (
 	"testing"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 func TestFormat(t *testing.T) {

config/source/file/options.go

@@ -3,7 +3,7 @@ package file
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type filePathKey struct{}

config/source/file/watcher.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type watcher struct {

config/source/file/watcher_linux.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type watcher struct {

config/source/flag/flag.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"flag"
 	"github.com/imdario/mergo"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 	"strings"
 	"time"
 )

config/source/flag/options.go

@@ -3,7 +3,7 @@ package flag
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type includeUnsetKey struct{}

config/source/memory/memory.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type memory struct {

config/source/memory/options.go

@@ -3,7 +3,7 @@ package memory
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type changeSetKey struct{}

config/source/memory/watcher.go

@@ -1,7 +1,7 @@
 package memory
 
 import (
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type watcher struct {

config/source/options.go

@@ -3,8 +3,8 @@ package source
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/encoder"
-	"github.com/micro/go-micro/config/encoder/json"
+	"github.com/micro/go-micro/v2/config/encoder"
+	"github.com/micro/go-micro/v2/config/encoder/json"
 )
 
 type Options struct {

config/source/service/options.go

@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type serviceNameKey struct{}

config/source/service/proto/service.pb.micro.go

@@ -11,8 +11,8 @@ import (
 
 import (
 	context "context"
-	client "github.com/micro/go-micro/client"
-	server "github.com/micro/go-micro/server"
+	client "github.com/micro/go-micro/v2/client"
+	server "github.com/micro/go-micro/v2/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

config/source/service/service.go

@@ -3,10 +3,10 @@ package service
 import (
 	"context"
 
-	"github.com/micro/go-micro/client"
-	"github.com/micro/go-micro/config/source"
-	proto "github.com/micro/go-micro/config/source/service/proto"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/client"
+	"github.com/micro/go-micro/v2/config/source"
+	proto "github.com/micro/go-micro/v2/config/source/service/proto"
+	"github.com/micro/go-micro/v2/util/log"
 )
 
 var (

config/source/service/util.go

@@ -3,8 +3,8 @@ package service
 import (
 	"time"
 
-	"github.com/micro/go-micro/config/source"
-	proto "github.com/micro/go-micro/config/source/service/proto"
+	"github.com/micro/go-micro/v2/config/source"
+	proto "github.com/micro/go-micro/v2/config/source/service/proto"
 )
 
 func toChangeSet(c *proto.ChangeSet) *source.ChangeSet {

config/source/service/watcher.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/micro/go-micro/config/source"
-	proto "github.com/micro/go-micro/config/source/service/proto"
+	"github.com/micro/go-micro/v2/config/source"
+	proto "github.com/micro/go-micro/v2/config/source/service/proto"
 )
 
 type watcher struct {

config/value.go

@@ -3,7 +3,7 @@ package config
 import (
 	"time"
 
-	"github.com/micro/go-micro/config/reader"
+	"github.com/micro/go-micro/v2/config/reader"
 )
 
 type value struct{}