Skip to content

Commit 5e8dd92

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #743 from openshift-cherrypick-robot/cherry-pick-740-to-release-4.14
[release-4.14] OCPBUGS-33356: UPSTREAM: <carry>: bump go-jose
2 parents dcfcfb3 + 2602208 commit 5e8dd92

File tree

174 files changed

+2741
-3044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+2741
-3044
lines changed

‎go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/go-logr/logr v1.3.0
99
github.com/golang/mock v1.6.0
1010
github.com/googleapis/gnostic v0.5.5
11-
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
11+
github.com/grpc-ecosystem/grpc-health-probe v0.4.24
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1414
github.com/onsi/ginkgo/v2 v2.12.0
@@ -90,6 +90,7 @@ require (
9090
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9191
github.com/go-git/go-git/v5 v5.11.0 // indirect
9292
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
93+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9394
github.com/go-logr/stdr v1.2.2 // indirect
9495
github.com/go-logr/zapr v1.2.4 // indirect
9596
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -182,7 +183,7 @@ require (
182183
github.com/shopspring/decimal v1.3.1 // indirect
183184
github.com/spf13/cast v1.5.0 // indirect
184185
github.com/spf13/pflag v1.0.5 // indirect
185-
github.com/spiffe/go-spiffe/v2 v2.0.0 // indirect
186+
github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect
186187
github.com/stoewer/go-strcase v1.2.0 // indirect
187188
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
188189
github.com/ulikunitz/xz v0.5.11 // indirect
@@ -210,29 +211,28 @@ require (
210211
go.uber.org/atomic v1.7.0 // indirect
211212
go.uber.org/multierr v1.6.0 // indirect
212213
go.uber.org/zap v1.24.0 // indirect
213-
golang.org/x/crypto v0.16.0 // indirect
214+
golang.org/x/crypto v0.19.0 // indirect
214215
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
215216
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
216-
golang.org/x/mod v0.12.0 // indirect
217+
golang.org/x/mod v0.14.0 // indirect
217218
golang.org/x/net v0.19.0 // indirect
218219
golang.org/x/oauth2 v0.13.0 // indirect
219-
golang.org/x/sync v0.4.0 // indirect
220-
golang.org/x/sys v0.15.0 // indirect
221-
golang.org/x/term v0.15.0 // indirect
220+
golang.org/x/sync v0.5.0 // indirect
221+
golang.org/x/sys v0.17.0 // indirect
222+
golang.org/x/term v0.17.0 // indirect
222223
golang.org/x/text v0.14.0 // indirect
223224
golang.org/x/time v0.3.0 // indirect
224-
golang.org/x/tools v0.13.0 // indirect
225+
golang.org/x/tools v0.16.1 // indirect
225226
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
226227
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
227228
google.golang.org/appengine v1.6.8 // indirect
228-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
229-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
230-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
229+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
230+
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
231+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
231232
google.golang.org/grpc v1.60.1 // indirect
232233
gopkg.in/inf.v0 v0.9.1 // indirect
233234
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
234235
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
235-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
236236
gopkg.in/warnings.v0 v0.1.2 // indirect
237237
gopkg.in/yaml.v3 v3.0.1 // indirect
238238
k8s.io/apiextensions-apiserver v0.27.8 // indirect

‎go.sum

Lines changed: 38 additions & 30 deletions
Large diffs are not rendered by default.

‎staging/operator-registry/go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/golang-migrate/migrate/v4 v4.16.1
1414
github.com/golang/mock v1.6.0
1515
github.com/google/go-cmp v0.6.0
16-
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
16+
github.com/grpc-ecosystem/grpc-health-probe v0.4.24
1717
github.com/h2non/filetype v1.1.1
1818
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
1919
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d
@@ -31,12 +31,12 @@ require (
3131
github.com/spf13/cobra v1.7.0
3232
github.com/stretchr/testify v1.8.4
3333
go.etcd.io/bbolt v1.3.7
34-
golang.org/x/mod v0.12.0
34+
golang.org/x/mod v0.14.0
3535
golang.org/x/net v0.19.0
36-
golang.org/x/sync v0.3.0
37-
golang.org/x/sys v0.15.0
36+
golang.org/x/sync v0.5.0
37+
golang.org/x/sys v0.17.0
3838
golang.org/x/text v0.14.0
39-
google.golang.org/grpc v1.59.0
39+
google.golang.org/grpc v1.60.1
4040
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
4141
google.golang.org/protobuf v1.31.0
4242
gopkg.in/yaml.v2 v2.4.0
@@ -90,6 +90,7 @@ require (
9090
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9191
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9292
github.com/go-git/go-git/v5 v5.11.0 // indirect
93+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9394
github.com/go-logr/logr v1.3.0 // indirect
9495
github.com/go-logr/stdr v1.2.2 // indirect
9596
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -141,7 +142,7 @@ require (
141142
github.com/prometheus/procfs v0.9.0 // indirect
142143
github.com/russross/blackfriday/v2 v2.1.0 // indirect
143144
github.com/spf13/pflag v1.0.5 // indirect
144-
github.com/spiffe/go-spiffe/v2 v2.0.0 // indirect
145+
github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect
145146
github.com/stoewer/go-strcase v1.2.0 // indirect
146147
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
147148
github.com/ulikunitz/xz v0.5.11 // indirect
@@ -159,18 +160,17 @@ require (
159160
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
160161
go.opentelemetry.io/otel/trace v1.20.0 // indirect
161162
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
162-
golang.org/x/crypto v0.16.0 // indirect
163+
golang.org/x/crypto v0.19.0 // indirect
163164
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
164-
golang.org/x/oauth2 v0.12.0 // indirect
165-
golang.org/x/term v0.15.0 // indirect
165+
golang.org/x/oauth2 v0.13.0 // indirect
166+
golang.org/x/term v0.17.0 // indirect
166167
golang.org/x/time v0.3.0 // indirect
167-
golang.org/x/tools v0.13.0 // indirect
168-
google.golang.org/appengine v1.6.7 // indirect
169-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
170-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
171-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
168+
golang.org/x/tools v0.16.1 // indirect
169+
google.golang.org/appengine v1.6.8 // indirect
170+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
171+
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
172+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
172173
gopkg.in/inf.v0 v0.9.1 // indirect
173-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
174174
gopkg.in/warnings.v0 v0.1.2 // indirect
175175
gopkg.in/yaml.v3 v3.0.1 // indirect
176176
k8s.io/apiserver v0.27.8 // indirect

0 commit comments

Comments
 (0)