Skip to content

Commit e9262fe

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #968 from tmshort/update-dist-4.17
OCPBUGS-50829, OCPBUGS-50831, OCPBUGS-50835: CVE-2025-24976 Bump github.com/distribution/distribution/v3 [release-4.17]
2 parents f667826 + cd3b82b commit e9262fe

File tree

359 files changed

+17021
-14559
lines changed

Some content is hidden

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

359 files changed

+17021
-14559
lines changed

‎go.mod

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/openshift/operator-framework-olm
22

3-
go 1.22.0
4-
5-
toolchain go1.22.3
3+
go 1.22.7
64

75
require (
86
github.com/blang/semver/v4 v4.0.0
@@ -22,7 +20,7 @@ require (
2220
github.com/spf13/cobra v1.8.1
2321
github.com/stretchr/testify v1.10.0
2422
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
25-
google.golang.org/protobuf v1.34.2
23+
google.golang.org/protobuf v1.35.1
2624
gopkg.in/yaml.v2 v2.4.0
2725
helm.sh/helm/v3 v3.14.4
2826
k8s.io/api v0.30.3
@@ -65,7 +63,7 @@ require (
6563
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
6664
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6765
github.com/beorn7/perks v1.0.1 // indirect
68-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
66+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6967
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7068
github.com/chai2010/gettext-go v1.0.2 // indirect
7169
github.com/containerd/cgroups/v3 v3.0.3 // indirect
@@ -91,7 +89,7 @@ require (
9189
github.com/docker/cli v27.0.3+incompatible // indirect
9290
github.com/docker/distribution v2.8.3+incompatible // indirect
9391
github.com/docker/docker v26.1.4+incompatible // indirect
94-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
92+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
9593
github.com/docker/go-connections v0.5.0 // indirect
9694
github.com/docker/go-metrics v0.0.1 // indirect
9795
github.com/docker/go-units v0.5.0 // indirect
@@ -109,7 +107,7 @@ require (
109107
github.com/go-git/go-billy/v5 v5.6.1 // indirect
110108
github.com/go-git/go-git/v5 v5.13.1 // indirect
111109
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
112-
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
110+
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
113111
github.com/go-logr/stdr v1.2.2 // indirect
114112
github.com/go-logr/zapr v1.3.0 // indirect
115113
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -138,7 +136,7 @@ require (
138136
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
139137
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
140138
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
141-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
139+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
142140
github.com/h2non/filetype v1.1.3 // indirect
143141
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
144142
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -154,7 +152,7 @@ require (
154152
github.com/josharian/intern v1.0.0 // indirect
155153
github.com/json-iterator/go v1.1.12 // indirect
156154
github.com/kisielk/errcheck v1.7.0 // indirect
157-
github.com/klauspost/compress v1.17.8 // indirect
155+
github.com/klauspost/compress v1.17.11 // indirect
158156
github.com/kylelemons/godebug v1.1.0 // indirect
159157
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
160158
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -190,10 +188,10 @@ require (
190188
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
191189
github.com/pkg/errors v0.9.1 // indirect
192190
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
193-
github.com/prometheus/client_golang v1.19.0 // indirect
191+
github.com/prometheus/client_golang v1.20.5 // indirect
194192
github.com/prometheus/client_model v0.6.1 // indirect
195-
github.com/prometheus/common v0.51.1 // indirect
196-
github.com/prometheus/procfs v0.12.0 // indirect
193+
github.com/prometheus/common v0.60.1 // indirect
194+
github.com/prometheus/procfs v0.15.1 // indirect
197195
github.com/rivo/uniseg v0.4.7 // indirect
198196
github.com/rubenv/sql-migrate v1.5.2 // indirect
199197
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -215,14 +213,14 @@ require (
215213
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
216214
go.opencensus.io v0.24.0 // indirect
217215
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
218-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
219-
go.opentelemetry.io/otel v1.24.0 // indirect
220-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
221-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
222-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
223-
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
224-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
225-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
216+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
217+
go.opentelemetry.io/otel v1.32.0 // indirect
218+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
219+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
220+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
221+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
222+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
223+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
226224
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
227225
go.uber.org/multierr v1.11.0 // indirect
228226
go.uber.org/zap v1.26.0 // indirect
@@ -231,7 +229,7 @@ require (
231229
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
232230
golang.org/x/mod v0.21.0 // indirect
233231
golang.org/x/net v0.34.0 // indirect
234-
golang.org/x/oauth2 v0.20.0 // indirect
232+
golang.org/x/oauth2 v0.23.0 // indirect
235233
golang.org/x/sync v0.10.0 // indirect
236234
golang.org/x/sys v0.29.0 // indirect
237235
golang.org/x/term v0.28.0 // indirect
@@ -240,10 +238,10 @@ require (
240238
golang.org/x/tools v0.26.0 // indirect
241239
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
242240
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
243-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
244-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
245-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
246-
google.golang.org/grpc v1.65.0 // indirect
241+
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
242+
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
243+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
244+
google.golang.org/grpc v1.68.0 // indirect
247245
gopkg.in/inf.v0 v0.9.1 // indirect
248246
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
249247
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect

0 commit comments

Comments
 (0)