Merge pull request #1465 from Shopify/diego_remove-direct-reference-g…

…ofork removes gofork direct usage as fix is part of go
IBM · Aug 21, 2019 · d5e4de4 · d5e4de4
2 parents 4b0a0e5 + bfff38f
commit d5e4de4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -50,3 +50,7 @@ get:
 .PHONY: clean
 clean:
 	go clean ./...
+
+.PHONY: tidy
+tidy:
+	go mod tidy -v
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.1 // indirect
-	github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03
+	github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03 // indirect
 	github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41
 	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
 	github.com/stretchr/testify v1.3.0

diff --git a/gssapi_kerberos.go b/gssapi_kerberos.go
@@ -1,18 +1,19 @@
 package sarama
 
 import (
+	"encoding/asn1"
 	"encoding/binary"
 	"fmt"
-	"github.com/jcmturner/gofork/encoding/asn1"
+	"io"
+	"strings"
+	"time"
+
 	"gopkg.in/jcmturner/gokrb5.v7/asn1tools"
 	"gopkg.in/jcmturner/gokrb5.v7/gssapi"
 	"gopkg.in/jcmturner/gokrb5.v7/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v7/iana/keyusage"
 	"gopkg.in/jcmturner/gokrb5.v7/messages"
 	"gopkg.in/jcmturner/gokrb5.v7/types"
-	"io"
-	"strings"
-	"time"
 )
 
 const (