Skip to content

Commit 6a7ec89

Browse files
authored
Merge pull request #4512 from butonic/bump-minio
bump dependencies to match ocis
2 parents d5e420d + 91be73a commit 6a7ec89

File tree

12 files changed

+1024
-504
lines changed

12 files changed

+1024
-504
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Bugfix: bump dependencies
2+
3+
We updated the dependencies to at least match the ones used in ocis.
4+
5+
https://github.com/cs3org/reva/pull/4512

go.mod

+85-87
Original file line numberDiff line numberDiff line change
@@ -6,96 +6,95 @@ require (
66
bou.ke/monkey v1.0.2
77
contrib.go.opencensus.io/exporter/prometheus v0.4.2
88
github.com/BurntSushi/toml v1.3.2
9-
github.com/CiscoM31/godata v1.0.7
9+
github.com/CiscoM31/godata v1.0.10
1010
github.com/Masterminds/sprig v2.22.0+incompatible
1111
github.com/armon/go-radix v1.0.0
12-
github.com/aws/aws-sdk-go v1.44.181
13-
github.com/beevik/etree v1.2.0
12+
github.com/aws/aws-sdk-go v1.45.1
13+
github.com/beevik/etree v1.3.0
1414
github.com/bluele/gcache v0.0.2
1515
github.com/c-bata/go-prompt v0.2.6
1616
github.com/cenkalti/backoff v2.2.1+incompatible
1717
github.com/ceph/go-ceph v0.18.0
1818
github.com/cheggaaa/pb v1.0.29
19-
github.com/coreos/go-oidc v2.2.1+incompatible
19+
github.com/coreos/go-oidc/v3 v3.4.0
2020
github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
2121
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
2222
github.com/dgraph-io/ristretto v0.1.1
23-
github.com/emvi/iso-639-1 v1.0.1
23+
github.com/emvi/iso-639-1 v1.1.0
2424
github.com/eventials/go-tus v0.0.0-20220610120217-05d0564bb571
2525
github.com/gdexlab/go-render v1.0.1
26-
github.com/go-chi/chi/v5 v5.0.8
26+
github.com/go-chi/chi/v5 v5.0.11
2727
github.com/go-ldap/ldap/v3 v3.4.6
2828
github.com/go-micro/plugins/v4/events/natsjs v1.2.2-0.20231215124540-f7f8d3274bf9
29-
github.com/go-micro/plugins/v4/server/http v1.2.1
30-
github.com/go-micro/plugins/v4/store/nats-js v1.1.0
29+
github.com/go-micro/plugins/v4/server/http v1.2.2
30+
github.com/go-micro/plugins/v4/store/nats-js v1.2.0
3131
github.com/go-micro/plugins/v4/store/nats-js-kv v0.0.0-00010101000000-000000000000
32-
github.com/go-micro/plugins/v4/store/redis v1.2.1-0.20230510195111-07cd57e1bc9d
33-
github.com/go-playground/locales v0.13.0
34-
github.com/go-playground/universal-translator v0.17.0
35-
github.com/go-playground/validator/v10 v10.4.1
32+
github.com/go-micro/plugins/v4/store/redis v1.2.1
33+
github.com/go-playground/locales v0.14.1
34+
github.com/go-playground/universal-translator v0.18.1
35+
github.com/go-playground/validator/v10 v10.17.0
3636
github.com/go-redis/redis/v8 v8.11.5
37-
github.com/go-sql-driver/mysql v1.6.0
37+
github.com/go-sql-driver/mysql v1.7.1
3838
github.com/gofrs/flock v0.8.1
3939
github.com/golang-jwt/jwt v3.2.2+incompatible
4040
github.com/golang/protobuf v1.5.3
4141
github.com/gomodule/redigo v1.8.9
42-
github.com/google/go-cmp v0.5.9
42+
github.com/google/go-cmp v0.6.0
4343
github.com/google/go-github v17.0.0+incompatible
4444
github.com/google/renameio/v2 v2.0.0
45-
github.com/google/uuid v1.4.0
46-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
47-
github.com/hashicorp/go-hclog v1.3.1
48-
github.com/hashicorp/go-plugin v1.4.5
49-
github.com/huandu/xstrings v1.3.2
50-
github.com/iancoleman/strcase v0.2.0
45+
github.com/google/uuid v1.6.0
46+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
47+
github.com/hashicorp/go-hclog v1.6.2
48+
github.com/hashicorp/go-plugin v1.6.0
49+
github.com/huandu/xstrings v1.4.0
50+
github.com/iancoleman/strcase v0.3.0
5151
github.com/jedib0t/go-pretty v4.3.0+incompatible
5252
github.com/jellydator/ttlcache/v2 v2.11.1
5353
github.com/juliangruber/go-intersect v1.1.0
54-
github.com/mattn/go-sqlite3 v1.14.19
54+
github.com/mattn/go-sqlite3 v1.14.22
5555
github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b
56-
github.com/mileusna/useragent v1.2.1
57-
github.com/minio/minio-go/v7 v7.0.42
56+
github.com/mileusna/useragent v1.3.4
57+
github.com/minio/minio-go/v7 v7.0.66
5858
github.com/mitchellh/mapstructure v1.5.0
59-
github.com/nats-io/nats-server/v2 v2.9.19
60-
github.com/nats-io/nats.go v1.31.0
59+
github.com/nats-io/nats-server/v2 v2.10.10
60+
github.com/nats-io/nats.go v1.32.0
6161
github.com/onsi/ginkgo v1.16.5
62-
github.com/onsi/ginkgo/v2 v2.11.0
63-
github.com/onsi/gomega v1.27.8
62+
github.com/onsi/ginkgo/v2 v2.15.0
63+
github.com/onsi/gomega v1.31.1
6464
github.com/owncloud/ocis/v2 v2.0.0
6565
github.com/pkg/errors v0.9.1
6666
github.com/pkg/xattr v0.4.9
67-
github.com/prometheus/alertmanager v0.24.0
68-
github.com/prometheus/client_golang v1.16.0
69-
github.com/rogpeppe/go-internal v1.10.0
67+
github.com/prometheus/alertmanager v0.26.0
68+
github.com/prometheus/client_golang v1.18.0
69+
github.com/rogpeppe/go-internal v1.12.0
7070
github.com/rs/cors v1.10.1
71-
github.com/rs/zerolog v1.29.1
71+
github.com/rs/zerolog v1.32.0
7272
github.com/sethvargo/go-password v0.2.0
7373
github.com/shamaton/msgpack/v2 v2.1.1
7474
github.com/stretchr/testify v1.8.4
7575
github.com/studio-b12/gowebdav v0.0.0-20221015232716-17255f2e7423
7676
github.com/test-go/testify v1.1.4
77-
github.com/thanhpk/randstr v1.0.4
78-
github.com/tus/tusd v1.10.1
77+
github.com/thanhpk/randstr v1.0.6
78+
github.com/tus/tusd v1.13.0
7979
github.com/wk8/go-ordered-map v1.0.0
80-
go-micro.dev/v4 v4.9.0
81-
go.etcd.io/etcd/client/v3 v3.5.7
80+
go-micro.dev/v4 v4.10.2
81+
go.etcd.io/etcd/client/v3 v3.5.12
8282
go.opencensus.io v0.24.0
83-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4
84-
go.opentelemetry.io/otel v1.16.0
85-
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
86-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
87-
go.opentelemetry.io/otel/sdk v1.16.0
88-
go.opentelemetry.io/otel/trace v1.16.0
89-
golang.org/x/crypto v0.15.0
90-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
91-
golang.org/x/oauth2 v0.13.0
92-
golang.org/x/sync v0.2.0
93-
golang.org/x/sys v0.14.0
94-
golang.org/x/term v0.14.0
83+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0
84+
go.opentelemetry.io/otel v1.23.1
85+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1
86+
go.opentelemetry.io/otel/sdk v1.23.1
87+
go.opentelemetry.io/otel/trace v1.23.1
88+
golang.org/x/crypto v0.19.0
89+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
90+
golang.org/x/oauth2 v0.17.0
91+
golang.org/x/sync v0.6.0
92+
golang.org/x/sys v0.17.0
93+
golang.org/x/term v0.17.0
9594
golang.org/x/text v0.14.0
96-
google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e
97-
google.golang.org/grpc v1.56.2
98-
google.golang.org/protobuf v1.31.0
95+
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014
96+
google.golang.org/grpc v1.61.0
97+
google.golang.org/protobuf v1.32.0
9998
)
10099

101100
require (
@@ -106,7 +105,7 @@ require (
106105
github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad // indirect
107106
github.com/acomagu/bufpipe v1.0.3 // indirect
108107
github.com/armon/go-metrics v0.4.1 // indirect
109-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
108+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
110109
github.com/beorn7/perks v1.0.1 // indirect
111110
github.com/bitly/go-simplejson v0.5.0 // indirect
112111
github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect
@@ -119,66 +118,67 @@ require (
119118
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
120119
github.com/davecgh/go-spew v1.1.1 // indirect
121120
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
122-
github.com/dustin/go-humanize v1.0.0 // indirect
121+
github.com/dustin/go-humanize v1.0.1 // indirect
123122
github.com/emirpasic/gods v1.18.1 // indirect
124123
github.com/fatih/color v1.14.1 // indirect
125124
github.com/fsnotify/fsnotify v1.6.0 // indirect
125+
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
126126
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
127127
github.com/go-git/gcfg v1.5.0 // indirect
128128
github.com/go-git/go-billy/v5 v5.3.1 // indirect
129129
github.com/go-git/go-git/v5 v5.4.2 // indirect
130130
github.com/go-kit/log v0.2.1 // indirect
131131
github.com/go-logfmt/logfmt v0.5.1 // indirect
132-
github.com/go-logr/logr v1.2.4 // indirect
132+
github.com/go-logr/logr v1.4.1 // indirect
133133
github.com/go-logr/stdr v1.2.2 // indirect
134134
github.com/go-micro/plugins/v4/registry/consul v1.2.1 // indirect
135135
github.com/go-micro/plugins/v4/registry/etcd v1.2.0 // indirect
136136
github.com/go-micro/plugins/v4/registry/kubernetes v1.1.2-0.20230605104008-a179a6b8f8e6 // indirect
137137
github.com/go-micro/plugins/v4/registry/mdns v1.2.0 // indirect
138138
github.com/go-micro/plugins/v4/registry/memory v1.2.0 // indirect
139139
github.com/go-micro/plugins/v4/registry/nats v1.2.1 // indirect
140-
github.com/go-openapi/errors v0.20.2 // indirect
141-
github.com/go-openapi/strfmt v0.21.2 // indirect
140+
github.com/go-openapi/errors v0.20.4 // indirect
141+
github.com/go-openapi/strfmt v0.21.7 // indirect
142142
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
143143
github.com/gogo/protobuf v1.3.2 // indirect
144-
github.com/golang/glog v1.1.0 // indirect
144+
github.com/golang/glog v1.1.2 // indirect
145145
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
146146
github.com/google/go-querystring v1.1.0 // indirect
147147
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
148-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
148+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
149149
github.com/hashicorp/consul/api v1.15.2 // indirect
150150
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
151151
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
152152
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
153-
github.com/hashicorp/golang-lru v0.5.4 // indirect
153+
github.com/hashicorp/golang-lru v0.6.0 // indirect
154154
github.com/hashicorp/serf v0.10.0 // indirect
155-
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
155+
github.com/hashicorp/yamux v0.1.1 // indirect
156156
github.com/imdario/mergo v0.3.15 // indirect
157157
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
158158
github.com/jmespath/go-jmespath v0.4.0 // indirect
159159
github.com/json-iterator/go v1.1.12 // indirect
160160
github.com/kevinburke/ssh_config v1.2.0 // indirect
161-
github.com/klauspost/compress v1.17.0 // indirect
162-
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
163-
github.com/leodido/go-urn v1.2.0 // indirect
161+
github.com/klauspost/compress v1.17.5 // indirect
162+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
163+
github.com/leodido/go-urn v1.2.4 // indirect
164164
github.com/mattn/go-colorable v0.1.13 // indirect
165-
github.com/mattn/go-isatty v0.0.17 // indirect
165+
github.com/mattn/go-isatty v0.0.19 // indirect
166166
github.com/mattn/go-runewidth v0.0.13 // indirect
167167
github.com/mattn/go-tty v0.0.3 // indirect
168-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
168+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
169169
github.com/miekg/dns v1.1.50 // indirect
170170
github.com/minio/highwayhash v1.0.2 // indirect
171171
github.com/minio/md5-simd v1.1.2 // indirect
172-
github.com/minio/sha256-simd v1.0.0 // indirect
172+
github.com/minio/sha256-simd v1.0.1 // indirect
173173
github.com/mitchellh/copystructure v1.2.0 // indirect
174174
github.com/mitchellh/go-homedir v1.1.0 // indirect
175175
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
176176
github.com/mitchellh/hashstructure v1.1.0 // indirect
177177
github.com/mitchellh/reflectwalk v1.0.2 // indirect
178178
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
179179
github.com/modern-go/reflect2 v1.0.2 // indirect
180-
github.com/nats-io/jwt/v2 v2.4.1 // indirect
181-
github.com/nats-io/nkeys v0.4.5 // indirect
180+
github.com/nats-io/jwt/v2 v2.5.3 // indirect
181+
github.com/nats-io/nkeys v0.4.7 // indirect
182182
github.com/nats-io/nuid v1.0.1 // indirect
183183
github.com/nxadm/tail v1.4.8 // indirect
184184
github.com/oklog/run v1.1.0 // indirect
@@ -187,40 +187,38 @@ require (
187187
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
188188
github.com/pkg/term v1.2.0-beta.2 // indirect
189189
github.com/pmezard/go-difflib v1.0.0 // indirect
190-
github.com/pquerna/cachecontrol v0.1.0 // indirect
191-
github.com/prometheus/client_model v0.3.0 // indirect
192-
github.com/prometheus/common v0.42.0 // indirect
193-
github.com/prometheus/procfs v0.10.1 // indirect
190+
github.com/prometheus/client_model v0.5.0 // indirect
191+
github.com/prometheus/common v0.45.0 // indirect
192+
github.com/prometheus/procfs v0.12.0 // indirect
194193
github.com/prometheus/statsd_exporter v0.22.8 // indirect
195194
github.com/rivo/uniseg v0.4.2 // indirect
196-
github.com/rs/xid v1.4.0 // indirect
195+
github.com/rs/xid v1.5.0 // indirect
197196
github.com/russross/blackfriday/v2 v2.1.0 // indirect
198197
github.com/sergi/go-diff v1.2.0 // indirect
199198
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
200199
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
201-
github.com/sirupsen/logrus v1.9.0 // indirect
200+
github.com/sirupsen/logrus v1.9.3 // indirect
202201
github.com/stretchr/objx v0.5.0 // indirect
203202
github.com/tidwall/pretty v1.2.1 // indirect
204203
github.com/urfave/cli/v2 v2.25.7 // indirect
205204
github.com/xanzy/ssh-agent v0.3.2 // indirect
206205
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
207-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
208-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
209-
go.mongodb.org/mongo-driver v1.10.3 // indirect
210-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
211-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
212-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
213-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
214-
go.uber.org/atomic v1.10.0 // indirect
206+
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
207+
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
208+
go.mongodb.org/mongo-driver v1.11.3 // indirect
209+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
210+
go.opentelemetry.io/otel/metric v1.23.1 // indirect
211+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
212+
go.uber.org/atomic v1.11.0 // indirect
215213
go.uber.org/multierr v1.8.0 // indirect
216214
go.uber.org/zap v1.23.0 // indirect
217-
golang.org/x/mod v0.10.0 // indirect
218-
golang.org/x/net v0.17.0 // indirect
219-
golang.org/x/time v0.3.0 // indirect
220-
golang.org/x/tools v0.9.3 // indirect
215+
golang.org/x/mod v0.14.0 // indirect
216+
golang.org/x/net v0.21.0 // indirect
217+
golang.org/x/time v0.5.0 // indirect
218+
golang.org/x/tools v0.17.0 // indirect
221219
google.golang.org/appengine v1.6.8 // indirect
222-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
223-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
220+
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
221+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
224222
gopkg.in/ini.v1 v1.67.0 // indirect
225223
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
226224
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

0 commit comments

Comments
 (0)