Skip to content

Commit 2bdf858

Browse files
henderkeshenderkes
authored
Upgrade to Cady v2.11.1 (#2214)
fixes failing integration tests and closes #2213
1 parent f388348 commit 2bdf858

5 files changed

Lines changed: 120 additions & 63 deletions

File tree

‎caddy/go.mod‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ replace github.com/dunglas/frankenphp => ../
77
retract v1.0.0-rc.1 // Human error
88

99
require (
10-
github.com/caddyserver/caddy/v2 v2.10.2
11-
github.com/caddyserver/certmagic v0.25.1
10+
github.com/caddyserver/caddy/v2 v2.11.1
11+
github.com/caddyserver/certmagic v0.25.2
1212
github.com/dunglas/caddy-cbrotli v1.0.1
1313
github.com/dunglas/frankenphp v1.11.2
1414
github.com/dunglas/mercure v0.21.8
@@ -23,27 +23,29 @@ require github.com/smallstep/go-attestation v0.4.4-0.20241119153605-2306d5b464ca
2323

2424
require (
2525
cel.dev/expr v0.25.1 // indirect
26-
cloud.google.com/go/auth v0.18.1 // indirect
26+
cloud.google.com/go/auth v0.18.2 // indirect
2727
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2828
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2929
dario.cat/mergo v1.0.2 // indirect
30-
filippo.io/edwards25519 v1.1.0 // indirect
30+
filippo.io/bigmod v0.1.0 // indirect
31+
filippo.io/edwards25519 v1.2.0 // indirect
3132
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
3233
github.com/BurntSushi/toml v1.6.0 // indirect
34+
github.com/DeRuina/timberjack v1.3.9 // indirect
3335
github.com/KimMachineGun/automemlimit v0.7.5 // indirect
3436
github.com/Masterminds/goutils v1.1.1 // indirect
3537
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3638
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3739
github.com/MauriceGit/skiplist v0.0.0-20211105230623-77f5c8d3e145 // indirect
3840
github.com/MicahParks/jwkset v0.11.0 // indirect
39-
github.com/MicahParks/keyfunc/v3 v3.7.0 // indirect
41+
github.com/MicahParks/keyfunc/v3 v3.8.0 // indirect
4042
github.com/RoaringBitmap/roaring/v2 v2.14.4 // indirect
4143
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
4244
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
4345
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
4446
github.com/beorn7/perks v1.0.1 // indirect
4547
github.com/bits-and-blooms/bitset v1.24.4 // indirect
46-
github.com/caddyserver/zerossl v0.1.4 // indirect
48+
github.com/caddyserver/zerossl v0.1.5 // indirect
4749
github.com/ccoveille/go-safecast/v2 v2.0.0 // indirect
4850
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4951
github.com/cespare/xxhash v1.1.0 // indirect
@@ -92,7 +94,7 @@ require (
9294
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
9395
github.com/gorilla/handlers v1.5.2 // indirect
9496
github.com/gorilla/mux v1.8.1 // indirect
95-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.8 // indirect
97+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
9698
github.com/huandu/xstrings v1.5.0 // indirect
9799
github.com/inconshreveable/mousetrap v1.1.0 // indirect
98100
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -110,7 +112,7 @@ require (
110112
github.com/mattn/go-isatty v0.0.20 // indirect
111113
github.com/maypok86/otter/v2 v2.3.0 // indirect
112114
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
113-
github.com/mholt/acmez/v3 v3.1.4 // indirect
115+
github.com/mholt/acmez/v3 v3.1.6 // indirect
114116
github.com/miekg/dns v1.1.72 // indirect
115117
github.com/mitchellh/copystructure v1.2.0 // indirect
116118
github.com/mitchellh/go-ps v1.0.0 // indirect
@@ -128,6 +130,7 @@ require (
128130
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
129131
github.com/prometheus/client_model v0.6.2 // indirect
130132
github.com/prometheus/common v0.67.5 // indirect
133+
github.com/prometheus/otlptranslator v1.0.0 // indirect
131134
github.com/prometheus/procfs v0.19.2 // indirect
132135
github.com/quic-go/qpack v0.6.0 // indirect
133136
github.com/quic-go/quic-go v0.59.0 // indirect
@@ -138,8 +141,8 @@ require (
138141
github.com/shopspring/decimal v1.4.0 // indirect
139142
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
140143
github.com/sirupsen/logrus v1.9.4 // indirect
141-
github.com/slackhq/nebula v1.9.7 // indirect
142-
github.com/smallstep/certificates v0.29.0 // indirect
144+
github.com/slackhq/nebula v1.10.3 // indirect
145+
github.com/smallstep/certificates v0.30.0-rc2.0.20260211214201-20608299c29c // indirect
143146
github.com/smallstep/cli-utils v0.12.2 // indirect
144147
github.com/smallstep/linkedca v0.25.0 // indirect
145148
github.com/smallstep/nosql v0.7.0 // indirect
@@ -167,29 +170,43 @@ require (
167170
github.com/zeebo/blake3 v0.2.4 // indirect
168171
go.etcd.io/bbolt v1.4.3 // indirect
169172
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
173+
go.opentelemetry.io/contrib/bridges/prometheus v0.65.0 // indirect
174+
go.opentelemetry.io/contrib/exporters/autoexport v0.65.0 // indirect
170175
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
171176
go.opentelemetry.io/contrib/propagators/autoprop v0.65.0 // indirect
172177
go.opentelemetry.io/contrib/propagators/aws v1.40.0 // indirect
173178
go.opentelemetry.io/contrib/propagators/b3 v1.40.0 // indirect
174179
go.opentelemetry.io/contrib/propagators/jaeger v1.40.0 // indirect
175180
go.opentelemetry.io/contrib/propagators/ot v1.40.0 // indirect
176181
go.opentelemetry.io/otel v1.40.0 // indirect
182+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0 // indirect
183+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0 // indirect
184+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.40.0 // indirect
185+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.40.0 // indirect
177186
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
178187
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
188+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0 // indirect
189+
go.opentelemetry.io/otel/exporters/prometheus v0.62.0 // indirect
190+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.16.0 // indirect
191+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.40.0 // indirect
192+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0 // indirect
193+
go.opentelemetry.io/otel/log v0.16.0 // indirect
179194
go.opentelemetry.io/otel/metric v1.40.0 // indirect
180195
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
196+
go.opentelemetry.io/otel/sdk/log v0.16.0 // indirect
197+
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
181198
go.opentelemetry.io/otel/trace v1.40.0 // indirect
182199
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
183-
go.step.sm/crypto v0.76.0 // indirect
200+
go.step.sm/crypto v0.76.2 // indirect
184201
go.uber.org/automaxprocs v1.6.0 // indirect
185202
go.uber.org/multierr v1.11.0 // indirect
186203
go.uber.org/zap v1.27.1 // indirect
187204
go.uber.org/zap/exp v0.3.0 // indirect
188205
go.yaml.in/yaml/v2 v2.4.3 // indirect
189206
go.yaml.in/yaml/v3 v3.0.4 // indirect
190207
golang.org/x/crypto v0.48.0 // indirect
191-
golang.org/x/crypto/x509roots/fallback v0.0.0-20260209214922-2f26647a795e // indirect
192-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 // indirect
208+
golang.org/x/crypto/x509roots/fallback v0.0.0-20260213171211-a408498e5541 // indirect
209+
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
193210
golang.org/x/mod v0.33.0 // indirect
194211
golang.org/x/net v0.50.0 // indirect
195212
golang.org/x/oauth2 v0.35.0 // indirect
@@ -199,13 +216,12 @@ require (
199216
golang.org/x/text v0.34.0 // indirect
200217
golang.org/x/time v0.14.0 // indirect
201218
golang.org/x/tools v0.42.0 // indirect
202-
google.golang.org/api v0.266.0 // indirect
203-
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
204-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
205-
google.golang.org/grpc v1.78.0 // indirect
219+
google.golang.org/api v0.267.0 // indirect
220+
google.golang.org/genproto/googleapis/api v0.0.0-20260217215200-42d3e9bedb6d // indirect
221+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
222+
google.golang.org/grpc v1.79.1 // indirect
206223
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.1 // indirect
207224
google.golang.org/protobuf v1.36.11 // indirect
208-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
209225
gopkg.in/yaml.v3 v3.0.1 // indirect
210226
howett.net/plist v1.0.1 // indirect
211227
)

0 commit comments

Comments
 (0)