Skip to content

Commit 03995c5

Browse files
committed
Address import collision due to googleapis/go-genproto#1015
1 parent 25c7ab7 commit 03995c5

File tree

2 files changed

+59
-57
lines changed

2 files changed

+59
-57
lines changed

go.mod

+19-17
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/jarcoal/httpmock v1.2.0
1818
github.com/labstack/echo-contrib v0.11.0
1919
github.com/labstack/echo/v4 v4.9.1
20-
github.com/orlangure/gnomock v0.28.0
20+
github.com/orlangure/gnomock v0.31.0
2121
github.com/pmezard/go-difflib v1.0.0
2222
github.com/prometheus/client_golang v1.11.1
2323
github.com/sirupsen/logrus v1.9.3
@@ -34,11 +34,10 @@ require (
3434
github.com/Microsoft/go-winio v0.5.2 // indirect
3535
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3636
github.com/beorn7/perks v1.0.1 // indirect
37-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
38-
github.com/containerd/log v0.1.0 // indirect
37+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3938
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
40-
github.com/distribution/reference v0.5.0 // indirect
41-
github.com/docker/docker v25.0.6+incompatible // indirect
39+
github.com/distribution/reference v0.6.0 // indirect
40+
github.com/docker/docker v27.3.1+incompatible // indirect
4241
github.com/docker/go-connections v0.4.0 // indirect
4342
github.com/docker/go-units v0.4.0 // indirect
4443
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -49,7 +48,7 @@ require (
4948
github.com/go-openapi/swag v0.22.3 // indirect
5049
github.com/gogo/protobuf v1.3.2 // indirect
5150
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
52-
github.com/golang/protobuf v1.5.3 // indirect
51+
github.com/golang/protobuf v1.5.4 // indirect
5352
github.com/google/uuid v1.6.0 // indirect
5453
github.com/hashicorp/hcl v1.0.0 // indirect
5554
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -64,13 +63,14 @@ require (
6463
github.com/josharian/intern v1.0.0 // indirect
6564
github.com/kr/pretty v0.3.0 // indirect
6665
github.com/labstack/gommon v0.4.0 // indirect
67-
github.com/lib/pq v1.10.8 // indirect
66+
github.com/lib/pq v1.10.9 // indirect
6867
github.com/magiconair/properties v1.8.5 // indirect
6968
github.com/mailru/easyjson v0.7.7 // indirect
7069
github.com/mattn/go-colorable v0.1.12 // indirect
7170
github.com/mattn/go-isatty v0.0.14 // indirect
7271
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
7372
github.com/mitchellh/mapstructure v1.5.0 // indirect
73+
github.com/moby/docker-image-spec v1.3.1 // indirect
7474
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
7575
github.com/opencontainers/go-digest v1.0.0 // indirect
7676
github.com/opencontainers/image-spec v1.0.2 // indirect
@@ -94,16 +94,18 @@ require (
9494
go.opentelemetry.io/otel/metric v1.28.0 // indirect
9595
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
9696
go.opentelemetry.io/otel/trace v1.28.0 // indirect
97-
go.uber.org/atomic v1.9.0 // indirect
98-
go.uber.org/multierr v1.7.0 // indirect
99-
go.uber.org/zap v1.24.0 // indirect
100-
golang.org/x/crypto v0.24.0 // indirect
101-
golang.org/x/net v0.26.0 // indirect
102-
golang.org/x/sync v0.7.0 // indirect
103-
golang.org/x/sys v0.21.0 // indirect
104-
golang.org/x/text v0.16.0 // indirect
105-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
106-
google.golang.org/protobuf v1.34.2 // indirect
97+
go.uber.org/multierr v1.10.0 // indirect
98+
go.uber.org/zap v1.27.0 // indirect
99+
golang.org/x/crypto v0.27.0 // indirect
100+
golang.org/x/net v0.29.0 // indirect
101+
golang.org/x/sync v0.8.0 // indirect
102+
golang.org/x/sys v0.25.0 // indirect
103+
golang.org/x/text v0.18.0 // indirect
104+
golang.org/x/time v0.3.0 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
107+
google.golang.org/grpc v1.67.1 // indirect
108+
google.golang.org/protobuf v1.35.1 // indirect
107109
gopkg.in/ini.v1 v1.66.2 // indirect
108110
gopkg.in/yaml.v2 v2.4.0 // indirect
109111
)

0 commit comments

Comments
 (0)