Skip to content

Commit 4cc5232

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #682 from anik120/git-go-cve-4.13
[release-4.13] OCPBUGS-27649,OCPBUGS-27564,OCPBUGS-27654,OCPBUGS-27569: bump go-git/v5 to 5.11.0
2 parents da84705 + 2dfb259 commit 4cc5232

File tree

770 files changed

+15642
-8984
lines changed

Some content is hidden

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

770 files changed

+15642
-8984
lines changed

‎go.mod

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ go 1.19
55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/go-bindata/go-bindata/v3 v3.1.3
8-
github.com/go-logr/logr v1.2.3
8+
github.com/go-logr/logr v1.3.0
99
github.com/golang/mock v1.6.0
1010
github.com/googleapis/gnostic v0.5.5
1111
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
14-
github.com/onsi/ginkgo/v2 v2.1.6
14+
github.com/onsi/ginkgo/v2 v2.11.0
1515
github.com/openshift/api v3.9.0+incompatible
1616
github.com/operator-framework/api v0.17.3
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
1818
github.com/operator-framework/operator-registry v1.17.5
19-
github.com/sirupsen/logrus v1.9.2
20-
github.com/spf13/cobra v1.4.0
21-
github.com/stretchr/testify v1.8.1
22-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
23-
google.golang.org/protobuf v1.28.1
19+
github.com/sirupsen/logrus v1.9.3
20+
github.com/spf13/cobra v1.7.0
21+
github.com/stretchr/testify v1.8.4
22+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
23+
google.golang.org/protobuf v1.31.0
2424
gopkg.in/yaml.v2 v2.4.0
2525
helm.sh/helm/v3 v3.9.0
2626
k8s.io/api v0.25.15
@@ -48,7 +48,7 @@ replace (
4848
)
4949

5050
require (
51-
cloud.google.com/go/compute v1.14.0 // indirect
51+
cloud.google.com/go/compute v1.23.0 // indirect
5252
cloud.google.com/go/compute/metadata v0.2.3 // indirect
5353
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5454
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -67,23 +67,21 @@ require (
6767
github.com/Microsoft/go-winio v0.6.1 // indirect
6868
github.com/Microsoft/hcsshim v0.9.2 // indirect
6969
github.com/NYTimes/gziphandler v1.1.1 // indirect
70-
github.com/PuerkitoBio/purell v1.1.1 // indirect
71-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
7270
github.com/adrg/xdg v0.4.0 // indirect
7371
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
7472
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
7573
github.com/beorn7/perks v1.0.1 // indirect
7674
github.com/blang/semver v3.5.1+incompatible // indirect
77-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
75+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7876
github.com/chai2010/gettext-go v1.0.2 // indirect
7977
github.com/containerd/cgroups v1.0.3 // indirect
8078
github.com/containerd/containerd v1.6.3 // indirect
8179
github.com/containerd/continuity v0.2.2 // indirect
8280
github.com/containerd/ttrpc v1.1.0 // indirect
8381
github.com/coreos/go-semver v0.3.0 // indirect
8482
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
85-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
86-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
83+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
84+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
8785
github.com/davecgh/go-spew v1.1.1 // indirect
8886
github.com/distribution/distribution v2.7.1+incompatible // indirect
8987
github.com/docker/cli v20.10.12+incompatible // indirect
@@ -97,21 +95,21 @@ require (
9795
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
9896
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
9997
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
100-
github.com/fatih/color v1.13.0 // indirect
101-
github.com/felixge/httpsnoop v1.0.1 // indirect
98+
github.com/fatih/color v1.15.0 // indirect
99+
github.com/felixge/httpsnoop v1.0.3 // indirect
102100
github.com/fsnotify/fsnotify v1.5.4 // indirect
103101
github.com/ghodss/yaml v1.0.0 // indirect
104102
github.com/go-air/gini v1.0.4 // indirect
105-
github.com/go-errors/errors v1.0.1 // indirect
106-
github.com/go-git/gcfg v1.5.0 // indirect
107-
github.com/go-git/go-billy/v5 v5.1.0 // indirect
108-
github.com/go-git/go-git/v5 v5.3.0 // indirect
109-
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
110-
github.com/go-logr/zapr v1.2.3 // indirect
111-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
112-
github.com/go-openapi/jsonreference v0.19.5 // indirect
113-
github.com/go-openapi/swag v0.19.14 // indirect
114-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
103+
github.com/go-errors/errors v1.4.2 // indirect
104+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
105+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
106+
github.com/go-git/go-git/v5 v5.11.0 // indirect
107+
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
108+
github.com/go-logr/zapr v1.2.4 // indirect
109+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
110+
github.com/go-openapi/jsonreference v0.20.2 // indirect
111+
github.com/go-openapi/swag v0.22.4 // indirect
112+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
115113
github.com/gobuffalo/flect v0.2.3 // indirect
116114
github.com/gobwas/glob v0.2.3 // indirect
117115
github.com/goccy/go-yaml v1.8.1 // indirect
@@ -120,15 +118,15 @@ require (
120118
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
121119
github.com/golang-migrate/migrate/v4 v4.16.1 // indirect
122120
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
123-
github.com/golang/protobuf v1.5.2 // indirect
121+
github.com/golang/protobuf v1.5.3 // indirect
124122
github.com/google/btree v1.0.1 // indirect
125123
github.com/google/cel-go v0.12.6 // indirect
126124
github.com/google/gnostic v0.5.7-v3refs // indirect
127-
github.com/google/go-cmp v0.5.9 // indirect
125+
github.com/google/go-cmp v0.6.0 // indirect
128126
github.com/google/gofuzz v1.2.0 // indirect
129127
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
130128
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
131-
github.com/google/uuid v1.3.0 // indirect
129+
github.com/google/uuid v1.3.1 // indirect
132130
github.com/gorilla/mux v1.8.0 // indirect
133131
github.com/gosuri/uitable v0.0.4 // indirect
134132
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
@@ -138,7 +136,7 @@ require (
138136
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
139137
github.com/huandu/xstrings v1.3.2 // indirect
140138
github.com/imdario/mergo v0.3.12 // indirect
141-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
139+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
142140
github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 // indirect
143141
github.com/itchyny/gojq v0.11.0 // indirect
144142
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -152,11 +150,11 @@ require (
152150
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
153151
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
154152
github.com/lestrrat-go/strftime v1.0.1 // indirect
155-
github.com/lib/pq v1.10.4 // indirect
153+
github.com/lib/pq v1.10.7 // indirect
156154
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
157-
github.com/mailru/easyjson v0.7.6 // indirect
158-
github.com/mattn/go-colorable v0.1.12 // indirect
159-
github.com/mattn/go-isatty v0.0.14 // indirect
155+
github.com/mailru/easyjson v0.7.7 // indirect
156+
github.com/mattn/go-colorable v0.1.13 // indirect
157+
github.com/mattn/go-isatty v0.0.17 // indirect
160158
github.com/mattn/go-runewidth v0.0.9 // indirect
161159
github.com/mattn/go-sqlite3 v1.14.16 // indirect
162160
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -174,7 +172,7 @@ require (
174172
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
175173
github.com/morikuni/aec v1.0.0 // indirect
176174
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
177-
github.com/onsi/gomega v1.20.1 // indirect
175+
github.com/onsi/gomega v1.27.10 // indirect
178176
github.com/opencontainers/go-digest v1.0.0 // indirect
179177
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
180178
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
@@ -201,42 +199,44 @@ require (
201199
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
202200
github.com/xlab/treeprint v1.1.0 // indirect
203201
github.com/zeebo/errs v1.3.0 // indirect
204-
go.etcd.io/bbolt v1.3.6 // indirect
202+
go.etcd.io/bbolt v1.3.7 // indirect
205203
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
206204
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
207205
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
208206
go.opencensus.io v0.24.0 // indirect
209207
go.opentelemetry.io/contrib v1.3.0 // indirect
210208
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
211-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
212-
go.opentelemetry.io/otel v1.3.0 // indirect
209+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
210+
go.opentelemetry.io/otel v1.20.0 // indirect
213211
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
214-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
215-
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
212+
go.opentelemetry.io/otel/metric v1.20.0 // indirect
213+
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
216214
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
217215
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
218-
go.opentelemetry.io/otel/trace v1.3.0 // indirect
219-
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
216+
go.opentelemetry.io/otel/trace v1.20.0 // indirect
217+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
220218
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
221219
go.uber.org/atomic v1.7.0 // indirect
222220
go.uber.org/multierr v1.6.0 // indirect
223-
go.uber.org/zap v1.21.0 // indirect
224-
golang.org/x/crypto v0.14.0 // indirect
221+
go.uber.org/zap v1.24.0 // indirect
222+
golang.org/x/crypto v0.16.0 // indirect
225223
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
226-
golang.org/x/mod v0.10.0 // indirect
227-
golang.org/x/net v0.17.0 // indirect
228-
golang.org/x/oauth2 v0.5.0 // indirect
229-
golang.org/x/sync v0.2.0 // indirect
230-
golang.org/x/sys v0.13.0 // indirect
231-
golang.org/x/term v0.13.0 // indirect
232-
golang.org/x/text v0.13.0 // indirect
224+
golang.org/x/mod v0.12.0 // indirect
225+
golang.org/x/net v0.19.0 // indirect
226+
golang.org/x/oauth2 v0.12.0 // indirect
227+
golang.org/x/sync v0.3.0 // indirect
228+
golang.org/x/sys v0.15.0 // indirect
229+
golang.org/x/term v0.15.0 // indirect
230+
golang.org/x/text v0.14.0 // indirect
233231
golang.org/x/time v0.3.0 // indirect
234-
golang.org/x/tools v0.9.1 // indirect
232+
golang.org/x/tools v0.13.0 // indirect
235233
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
236-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
234+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
237235
google.golang.org/appengine v1.6.7 // indirect
238-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
239-
google.golang.org/grpc v1.51.0 // indirect
236+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
237+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
238+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
239+
google.golang.org/grpc v1.59.0 // indirect
240240
gopkg.in/inf.v0 v0.9.1 // indirect
241241
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
242242
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
@@ -265,9 +265,6 @@ replace (
265265
// latest tag resolves to a very old version. this is only used for spinning up local test registries
266266
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
267267

268-
// pin to ginkgo v1 version of gomega (v1.18+ relies on ginkgo v2)
269-
github.com/onsi/gomega => github.com/onsi/gomega v1.17.0
270-
271268
// controller runtime
272269
github.com/openshift/api => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
273270
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5

0 commit comments

Comments
 (0)