[FABG-1002] Update dependencies for v2.2 (#106)

Signed-off-by: Troy Ronda <troy@troyronda.com>

Makefile

@@ -122,7 +122,7 @@ TEST_SCRIPTS_PATH      := test/scripts
 SOCAT_DOCKER_IMG       := $(shell docker images -q fabsdkgo-socat 2> /dev/null)
 
 # Tool commands
-MOCKGEN_CMD := gobin -run github.com/golang/mock/mockgen
+MOCKGEN_CMD := gobin -run github.com/golang/mock/mockgen@v1.4.3
 
 # Test fixture paths
 FIXTURE_SCRIPTS_PATH      := $(THIS_PATH)/test/scripts

go.mod

@@ -7,39 +7,30 @@ module github.com/hyperledger/fabric-sdk-go
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible
 	github.com/VividCortex/gohistogram v1.0.0 // indirect
-	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
 	github.com/cloudflare/cfssl v1.4.1
 	github.com/go-kit/kit v0.8.0
-	github.com/go-logfmt/logfmt v0.4.0 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/gogo/protobuf v1.1.1
-	github.com/golang/mock v1.2.0
+	github.com/golang/mock v1.4.3
 	github.com/golang/protobuf v1.3.3
-	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
-	github.com/hyperledger/fabric-config v0.0.6
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hyperledger/fabric-config v0.0.5
 	github.com/hyperledger/fabric-lib-go v1.0.0
-	github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e
-	github.com/magiconair/properties v1.7.6 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/miekg/pkcs11 v0.0.0-20190329070431-55f3fac3af27
-	github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238
-	github.com/pelletier/go-toml v1.1.0 // indirect
+	github.com/hyperledger/fabric-protos-go v0.0.0-20200707132912-fee30f3ccd23
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/miekg/pkcs11 v1.0.3
+	github.com/mitchellh/mapstructure v1.3.2
+	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/prometheus/client_golang v0.8.0
-	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect
-	github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 // indirect
-	github.com/prometheus/procfs v0.0.0-20180705121852-ae68e2d4c00f // indirect
-	github.com/spf13/afero v1.1.0 // indirect
-	github.com/spf13/cast v1.2.0
-	github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
-	github.com/spf13/pflag v1.0.1 // indirect
-	github.com/spf13/viper v1.0.2
-	github.com/stretchr/testify v1.3.0
-	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
-	golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
-	google.golang.org/genproto v0.0.0-20190327125643-d831d65fe17d // indirect
-	google.golang.org/grpc v1.23.0
-	gopkg.in/yaml.v2 v2.2.4
+	github.com/prometheus/client_golang v1.1.0
+	github.com/spf13/afero v1.3.1 // indirect
+	github.com/spf13/cast v1.3.1
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.1.1
+	github.com/stretchr/testify v1.5.1
+	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
+	golang.org/x/net v0.0.0-20190613194153-d28f0bde5980
+	google.golang.org/grpc v1.29.1
+	gopkg.in/yaml.v2 v2.3.0
 )
 
 go 1.14

internal/github.com/hyperledger/fabric/gossip/protoext/signing.go

@@ -14,7 +14,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-protos-go/gossip"
 )
 

internal/github.com/hyperledger/fabric/gossip/protoext/stringers.go

@@ -14,7 +14,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-protos-go/gossip"
 	"github.com/hyperledger/fabric-protos-go/msp"
 )

internal/github.com/hyperledger/fabric/protoutil/signeddata.go

@@ -14,7 +14,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-protos-go/common"
 )
 

internal/github.com/hyperledger/fabric/sdkinternal/configtxgen/encoder/encoder.go

@@ -11,7 +11,7 @@ Please review third_party pinning scripts and patches for more details.
 package encoder
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	cb "github.com/hyperledger/fabric-protos-go/common"
 	pb "github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/channelconfig"

pkg/fab/resource/configtxmsp.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"github.com/hyperledger/fabric-protos-go/msp"
 	mspcfg "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/msp"

pkg/fab/resource/configtxmsp_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"github.com/hyperledger/fabric-sdk-go/test/metadata"
 

pkg/gateway/wallet.go

@@ -9,7 +9,7 @@ package gateway
 import (
 	"encoding/json"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	pb_msp "github.com/hyperledger/fabric-protos-go/msp"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"

test/integration/go.mod

@@ -8,12 +8,12 @@ replace github.com/hyperledger/fabric-sdk-go => ../../
 
 require (
 	github.com/golang/protobuf v1.3.3
-	github.com/hyperledger/fabric-config v0.0.6
-	github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e
+	github.com/hyperledger/fabric-config v0.0.5
+	github.com/hyperledger/fabric-protos-go v0.0.0-20200707132912-fee30f3ccd23
 	github.com/hyperledger/fabric-sdk-go v0.0.0-00010101000000-000000000000
 	github.com/pkg/errors v0.8.1
-	github.com/stretchr/testify v1.3.0
-	google.golang.org/grpc v1.23.0
+	github.com/stretchr/testify v1.5.1
+	google.golang.org/grpc v1.29.1
 )
 
 go 1.14