File tree Expand file tree Collapse file tree 2 files changed +15
-6
lines changed Expand file tree Collapse file tree 2 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -117,8 +117,17 @@ replace (
117
117
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
118
118
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
119
119
120
- // github.com/ugorji/go/codec: ambiguous import: found github.com/ugorji/go/codec in multiple modules
121
- github.com/ugorji/go v1.1.1 => github.com/ugorji/go v0.0.0-20181204163529-d75b2dcb6bc8
120
+ // These replacements are required because various SDK dependencies
121
+ // depend on different versions of github.com/ugorji/go and
122
+ // github.com/ugorji/go/codec that conflict and break Go tooling due to the
123
+ // go.mod changes that have occurred recently in github.com/ugorji/go
124
+ // and github.com/ugorji/go/codec.
125
+ // See: https://github.com/ugorji/go/issues/299
126
+ //
127
+ // TODO: these replacements can be removed once the SDK
128
+ // dependencies have been updated to require at least v1.1.7
129
+ github.com/ugorji/go => github.com/ugorji/go v1.1.7
130
+ github.com/ugorji/go/codec => github.com/ugorji/go/codec v1.1.7
122
131
123
132
// Remove when controller-tools v0.2.2 is released
124
133
// Required for the bugfix https://github.com/kubernetes-sigs/controller-tools/pull/322
Original file line number Diff line number Diff line change @@ -424,10 +424,10 @@ github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 h1:DNVk+NIkGS
424
424
github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 /go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A =
425
425
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ =
426
426
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 /go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U =
427
- github.com/ugorji/go v0.0.0-20181204163529-d75b2dcb6bc8 h1:Kcv6ck5PWsaDifMwDDgexKfbmP1k63r3tcVppPa+FyM =
428
- github.com/ugorji/go v0.0.0-20181204163529-d75b2dcb6bc8 /go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ =
429
- github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648 =
430
- github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 /go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0 =
427
+ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo =
428
+ github.com/ugorji/go v1.1.7 /go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw =
429
+ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs =
430
+ github.com/ugorji/go/codec v1.1.7 /go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY =
431
431
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8 =
432
432
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 /go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU =
433
433
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek =
You can’t perform that action at this time.
0 commit comments