Skip to content

Commit 79225fb

Browse files
committed
Upgrade dependencies (x/net upgrade is held back or Go1.14 tests fail)
1 parent 2722c78 commit 79225fb

File tree

3 files changed

+370
-253
lines changed

3 files changed

+370
-253
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ help: ## Display this help screen
3434

3535
goversion ?= "1.16"
3636
test_version: ## Run tests inside Docker with given version (defaults to 1.15 oldest supported). Example: make test_version goversion=1.15
37-
@docker run --rm -it -v $(shell pwd):/project golang:$(goversion) /bin/sh -c "cd /project && make init check"
37+
@docker run --rm -it -v $(shell pwd):/project golang:$(goversion) /bin/sh -c "cd /project && make race"

go.mod

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,48 @@
11
module github.com/labstack/echo-contrib
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/HdrHistogram/hdrhistogram-go v1.1.0 // indirect
76
github.com/appleboy/gofight/v2 v2.1.2
8-
github.com/casbin/casbin/v2 v2.31.2
7+
github.com/casbin/casbin/v2 v2.40.6
98
github.com/gorilla/context v1.1.1
109
github.com/gorilla/sessions v1.2.1
11-
github.com/labstack/echo/v4 v4.5.0
12-
github.com/labstack/gommon v0.3.0
13-
github.com/mattn/go-isatty v0.0.14 // indirect
10+
github.com/labstack/echo/v4 v4.6.1
11+
github.com/labstack/gommon v0.3.1
1412
github.com/opentracing/opentracing-go v1.2.0
15-
github.com/openzipkin/zipkin-go v0.2.5
16-
github.com/prometheus/client_golang v1.10.0
17-
github.com/prometheus/common v0.25.0
13+
github.com/openzipkin/zipkin-go v0.3.0
14+
github.com/prometheus/client_golang v1.11.0
15+
github.com/prometheus/common v0.32.1
1816
github.com/stretchr/testify v1.7.0
19-
github.com/uber/jaeger-client-go v2.25.0+incompatible
20-
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
21-
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272 // indirect
22-
golang.org/x/net v0.0.0-20210917163549-3c21e5b27794 // indirect
23-
golang.org/x/sys v0.0.0-20210917161153-d61c044b1678 // indirect
17+
github.com/uber/jaeger-client-go v2.30.0+incompatible
18+
)
19+
20+
require (
21+
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
22+
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
23+
github.com/beorn7/perks v1.0.1 // indirect
24+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
25+
github.com/davecgh/go-spew v1.1.1 // indirect
26+
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
27+
github.com/golang/protobuf v1.5.2 // indirect
28+
github.com/gorilla/securecookie v1.1.1 // indirect
29+
github.com/mattn/go-colorable v0.1.11 // indirect
30+
github.com/mattn/go-isatty v0.0.14 // indirect
31+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
32+
github.com/pkg/errors v0.9.1 // indirect
33+
github.com/pmezard/go-difflib v1.0.0 // indirect
34+
github.com/prometheus/client_model v0.2.0 // indirect
35+
github.com/prometheus/procfs v0.6.0 // indirect
36+
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
37+
github.com/valyala/bytebufferpool v1.0.0 // indirect
38+
github.com/valyala/fasttemplate v1.2.1 // indirect
39+
go.uber.org/atomic v1.9.0 // indirect
40+
golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 // indirect
41+
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect
42+
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
2443
golang.org/x/text v0.3.7 // indirect
25-
golang.org/x/tools v0.1.6 // indirect
44+
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
45+
google.golang.org/grpc v1.41.0 // indirect
46+
google.golang.org/protobuf v1.27.1 // indirect
47+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
2648
)

0 commit comments

Comments
 (0)