From 2645b5c0e4a44223106ef998c8455ec4a9225c0c Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Tue, 4 Oct 2022 12:06:16 -0300 Subject: [PATCH] Remove deprecated net dependency (#9110) --- TAG | 2 +- go.mod | 2 +- test/e2e/annotations/grpc.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TAG b/TAG index 0d0c52f84d..97a3c26fdc 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -v1.4.0 +v1.4.0-old diff --git a/go.mod b/go.mod index 471e7749e3..01efaba681 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,6 @@ require ( github.com/yudai/gojsondiff v1.0.0 github.com/zakjan/cert-chain-resolver v0.0.0-20211122211144-c6b0b792af9a golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd - golang.org/x/net v0.0.0-20220722155237-a158d28d115b google.golang.org/grpc v1.49.0 gopkg.in/go-playground/pool.v3 v3.1.1 gopkg.in/mcuadros/go-syslog.v2 v2.3.0 @@ -106,6 +105,7 @@ require ( github.com/yudai/pp v2.0.1+incompatible // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect diff --git a/test/e2e/annotations/grpc.go b/test/e2e/annotations/grpc.go index dfe8141eec..39349e7018 100644 --- a/test/e2e/annotations/grpc.go +++ b/test/e2e/annotations/grpc.go @@ -21,10 +21,11 @@ import ( "fmt" "strings" + "context" + pb "github.com/moul/pb/grpcbin/go-grpc" "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata"