Skip to content

Commit a5e4289

Browse files
committed
feat: upgrade to Caddy 2.10
1 parent b508d1b commit a5e4289

File tree

5 files changed

+359
-396
lines changed

5 files changed

+359
-396
lines changed

caddy/go.mod

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/dunglas/mercure/caddy
22

3-
go 1.23.0
3+
go 1.24
44

5-
toolchain go1.24.0
5+
toolchain go1.24.2
66

77
retract (
88
v0.14.7 // CI problem
@@ -12,176 +12,176 @@ retract (
1212
replace github.com/dunglas/mercure => ../
1313

1414
require (
15-
github.com/KimMachineGun/automemlimit v0.7.0
16-
github.com/MicahParks/keyfunc/v3 v3.3.10
17-
github.com/caddyserver/caddy/v2 v2.9.1
15+
github.com/MicahParks/keyfunc/v3 v3.3.11
16+
github.com/caddyserver/caddy/v2 v2.10.0
1817
github.com/dunglas/mercure v0.18.4
1918
github.com/stretchr/testify v1.10.0
2019
go.uber.org/zap v1.27.0
21-
go.uber.org/zap/exp v0.3.0
2220
)
2321

2422
require (
25-
cel.dev/expr v0.20.0 // indirect
23+
cel.dev/expr v0.23.1 // indirect
2624
dario.cat/mergo v1.0.1 // indirect
2725
filippo.io/edwards25519 v1.1.0 // indirect
2826
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
29-
github.com/BurntSushi/toml v1.4.0 // indirect
27+
github.com/BurntSushi/toml v1.5.0 // indirect
28+
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
3029
github.com/Masterminds/goutils v1.1.1 // indirect
3130
github.com/Masterminds/semver/v3 v3.3.1 // indirect
3231
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3332
github.com/MauriceGit/skiplist v0.0.0-20211105230623-77f5c8d3e145 // indirect
34-
github.com/MicahParks/jwkset v0.8.0 // indirect
33+
github.com/MicahParks/jwkset v0.9.5 // indirect
3534
github.com/Microsoft/go-winio v0.6.2 // indirect
3635
github.com/RoaringBitmap/roaring v1.9.4 // indirect
37-
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
36+
github.com/alecthomas/chroma/v2 v2.17.0 // indirect
3837
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3938
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
4039
github.com/beorn7/perks v1.0.1 // indirect
41-
github.com/bits-and-blooms/bitset v1.20.0 // indirect
42-
github.com/caddyserver/certmagic v0.21.7 // indirect
40+
github.com/bits-and-blooms/bitset v1.22.0 // indirect
41+
github.com/caddyserver/certmagic v0.23.0 // indirect
4342
github.com/caddyserver/zerossl v0.1.3 // indirect
43+
github.com/ccoveille/go-safecast v1.6.1 // indirect
4444
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4545
github.com/cespare/xxhash v1.1.0 // indirect
4646
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4747
github.com/chzyer/readline v1.5.1 // indirect
48-
github.com/coreos/go-oidc/v3 v3.12.0 // indirect
48+
github.com/cloudflare/circl v1.6.1 // indirect
49+
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
4950
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
5051
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5152
github.com/dgraph-io/badger v1.6.2 // indirect
5253
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
5354
github.com/dgraph-io/ristretto v0.2.0 // indirect
5455
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
55-
github.com/dlclark/regexp2 v1.11.4 // indirect
56+
github.com/dlclark/regexp2 v1.11.5 // indirect
5657
github.com/dustin/go-humanize v1.0.1 // indirect
5758
github.com/felixge/httpsnoop v1.0.4 // indirect
5859
github.com/francoispqt/gojay v1.2.13 // indirect
59-
github.com/fsnotify/fsnotify v1.8.0 // indirect
60-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
61-
github.com/go-chi/chi/v5 v5.1.0 // indirect
62-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
63-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
60+
github.com/fsnotify/fsnotify v1.9.0 // indirect
61+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
62+
github.com/go-chi/chi/v5 v5.2.1 // indirect
63+
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
64+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
6465
github.com/go-logr/logr v1.4.2 // indirect
6566
github.com/go-logr/stdr v1.2.2 // indirect
66-
github.com/go-sql-driver/mysql v1.8.1 // indirect
67+
github.com/go-sql-driver/mysql v1.9.2 // indirect
6768
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
69+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
6870
github.com/gofrs/uuid v4.4.0+incompatible // indirect
69-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
71+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
7072
github.com/golang/protobuf v1.5.4 // indirect
71-
github.com/golang/snappy v0.0.4 // indirect
72-
github.com/google/cel-go v0.23.2 // indirect
73-
github.com/google/certificate-transparency-go v1.2.2 // indirect
73+
github.com/golang/snappy v1.0.0 // indirect
74+
github.com/google/cel-go v0.24.1 // indirect
75+
github.com/google/certificate-transparency-go v1.3.1 // indirect
7476
github.com/google/go-tpm v0.9.3 // indirect
7577
github.com/google/go-tspi v0.3.0 // indirect
76-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
78+
github.com/google/pprof v0.0.0-20250418163039-24c5476c6587 // indirect
7779
github.com/google/uuid v1.6.0 // indirect
7880
github.com/gorilla/handlers v1.5.2 // indirect
7981
github.com/gorilla/mux v1.8.1 // indirect
80-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
82+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
8183
github.com/hashicorp/golang-lru v1.0.2 // indirect
82-
github.com/hashicorp/hcl v1.0.0 // indirect
8384
github.com/huandu/xstrings v1.5.0 // indirect
8485
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8586
github.com/jackc/pgpassfile v1.0.0 // indirect
8687
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
87-
github.com/jackc/pgx/v5 v5.7.2 // indirect
88+
github.com/jackc/pgx/v5 v5.7.4 // indirect
8889
github.com/jackc/puddle/v2 v2.2.2 // indirect
8990
github.com/kevburnsjr/skipfilter v0.0.1 // indirect
90-
github.com/klauspost/compress v1.17.11 // indirect
91-
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
92-
github.com/libdns/libdns v0.2.3 // indirect
93-
github.com/magiconair/properties v1.8.9 // indirect
91+
github.com/klauspost/compress v1.18.0 // indirect
92+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
93+
github.com/libdns/libdns v1.0.0-beta.1 // indirect
9494
github.com/manifoldco/promptui v0.9.0 // indirect
9595
github.com/mattn/go-colorable v0.1.14 // indirect
9696
github.com/mattn/go-isatty v0.0.20 // indirect
9797
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
98-
github.com/mholt/acmez/v3 v3.0.1 // indirect
99-
github.com/miekg/dns v1.1.63 // indirect
98+
github.com/mholt/acmez/v3 v3.1.2 // indirect
99+
github.com/miekg/dns v1.1.65 // indirect
100100
github.com/mitchellh/copystructure v1.2.0 // indirect
101101
github.com/mitchellh/go-ps v1.0.0 // indirect
102-
github.com/mitchellh/mapstructure v1.5.0 // indirect
103102
github.com/mitchellh/reflectwalk v1.0.2 // indirect
104103
github.com/mschoch/smat v0.2.0 // indirect
105104
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
106-
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
105+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
107106
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
108-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
107+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
109108
github.com/pires/go-proxyproto v0.8.0 // indirect
110109
github.com/pkg/errors v0.9.1 // indirect
111110
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
112-
github.com/prometheus/client_golang v1.20.5 // indirect
113-
github.com/prometheus/client_model v0.6.1 // indirect
114-
github.com/prometheus/common v0.62.0 // indirect
115-
github.com/prometheus/procfs v0.15.1 // indirect
111+
github.com/prometheus/client_golang v1.22.0 // indirect
112+
github.com/prometheus/client_model v0.6.2 // indirect
113+
github.com/prometheus/common v0.63.0 // indirect
114+
github.com/prometheus/procfs v0.16.1 // indirect
116115
github.com/quic-go/qpack v0.5.1 // indirect
117-
github.com/quic-go/quic-go v0.49.0 // indirect
116+
github.com/quic-go/quic-go v0.51.0 // indirect
118117
github.com/rs/xid v1.6.0 // indirect
119118
github.com/russross/blackfriday/v2 v2.1.0 // indirect
120-
github.com/sagikazarmark/locafero v0.7.0 // indirect
121-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
119+
github.com/sagikazarmark/locafero v0.9.0 // indirect
122120
github.com/shopspring/decimal v1.4.0 // indirect
123121
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
124122
github.com/sirupsen/logrus v1.9.3 // indirect
125-
github.com/slackhq/nebula v1.9.4 // indirect
126-
github.com/smallstep/certificates v0.28.1 // indirect
127-
github.com/smallstep/cli-utils v0.10.0 // indirect
123+
github.com/slackhq/nebula v1.9.5 // indirect
124+
github.com/smallstep/certificates v0.28.3 // indirect
125+
github.com/smallstep/cli-utils v0.12.1 // indirect
128126
github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 // indirect
127+
github.com/smallstep/linkedca v0.23.0 // indirect
129128
github.com/smallstep/nosql v0.7.0 // indirect
130129
github.com/smallstep/pkcs7 v0.2.1 // indirect
131-
github.com/smallstep/scep v0.0.0-20241223071629-a37a330173bc // indirect
130+
github.com/smallstep/scep v0.0.0-20250318231241-a25cabb69492 // indirect
132131
github.com/smallstep/truststore v0.13.0 // indirect
133132
github.com/sourcegraph/conc v0.3.0 // indirect
134-
github.com/spf13/afero v1.12.0 // indirect
133+
github.com/spf13/afero v1.14.0 // indirect
135134
github.com/spf13/cast v1.7.1 // indirect
136135
github.com/spf13/cobra v1.9.1 // indirect
137136
github.com/spf13/pflag v1.0.6 // indirect
138-
github.com/spf13/viper v1.19.0 // indirect
137+
github.com/spf13/viper v1.20.1 // indirect
139138
github.com/stoewer/go-strcase v1.3.0 // indirect
140139
github.com/subosito/gotenv v1.6.0 // indirect
141140
github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53 // indirect
142141
github.com/unrolled/secure v1.17.0 // indirect
143142
github.com/urfave/cli v1.22.16 // indirect
144143
github.com/x448/float16 v0.8.4 // indirect
145144
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
146-
github.com/yuin/goldmark v1.7.8 // indirect
145+
github.com/yuin/goldmark v1.7.10 // indirect
147146
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
148147
github.com/zeebo/blake3 v0.2.4 // indirect
149148
go.etcd.io/bbolt v1.4.0 // indirect
150-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
151-
go.opentelemetry.io/contrib/propagators/autoprop v0.57.0 // indirect
152-
go.opentelemetry.io/contrib/propagators/aws v1.32.0 // indirect
153-
go.opentelemetry.io/contrib/propagators/b3 v1.32.0 // indirect
154-
go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 // indirect
155-
go.opentelemetry.io/contrib/propagators/ot v1.32.0 // indirect
156-
go.opentelemetry.io/otel v1.32.0 // indirect
157-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
158-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
159-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
160-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
161-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
162-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
163-
go.step.sm/crypto v0.57.1 // indirect
164-
go.step.sm/linkedca v0.22.2 // indirect
149+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
150+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
151+
go.opentelemetry.io/contrib/propagators/autoprop v0.60.0 // indirect
152+
go.opentelemetry.io/contrib/propagators/aws v1.35.0 // indirect
153+
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
154+
go.opentelemetry.io/contrib/propagators/jaeger v1.35.0 // indirect
155+
go.opentelemetry.io/contrib/propagators/ot v1.35.0 // indirect
156+
go.opentelemetry.io/otel v1.35.0 // indirect
157+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
158+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
159+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
160+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
161+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
162+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
163+
go.step.sm/crypto v0.61.0 // indirect
165164
go.uber.org/automaxprocs v1.6.0 // indirect
166-
go.uber.org/mock v0.5.0 // indirect
165+
go.uber.org/mock v0.5.1 // indirect
167166
go.uber.org/multierr v1.11.0 // indirect
168-
golang.org/x/crypto v0.33.0 // indirect
169-
golang.org/x/crypto/x509roots/fallback v0.0.0-20250214233241-911360c8a4f4 // indirect
170-
golang.org/x/exp v0.0.0-20250215185904-eff6e970281f // indirect
171-
golang.org/x/mod v0.23.0 // indirect
172-
golang.org/x/net v0.35.0 // indirect
173-
golang.org/x/oauth2 v0.26.0 // indirect
174-
golang.org/x/sync v0.11.0 // indirect
175-
golang.org/x/sys v0.30.0 // indirect
176-
golang.org/x/term v0.29.0 // indirect
177-
golang.org/x/text v0.22.0 // indirect
178-
golang.org/x/time v0.10.0 // indirect
179-
golang.org/x/tools v0.30.0 // indirect
180-
google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b // indirect
181-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
182-
google.golang.org/grpc v1.70.0 // indirect
183-
google.golang.org/protobuf v1.36.5 // indirect
184-
gopkg.in/ini.v1 v1.67.0 // indirect
167+
go.uber.org/zap/exp v0.3.0 // indirect
168+
golang.org/x/crypto v0.37.0 // indirect
169+
golang.org/x/crypto/x509roots/fallback v0.0.0-20250418111936-9c1aa6af88df // indirect
170+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
171+
golang.org/x/mod v0.24.0 // indirect
172+
golang.org/x/net v0.39.0 // indirect
173+
golang.org/x/oauth2 v0.29.0 // indirect
174+
golang.org/x/sync v0.13.0 // indirect
175+
golang.org/x/sys v0.32.0 // indirect
176+
golang.org/x/term v0.31.0 // indirect
177+
golang.org/x/text v0.24.0 // indirect
178+
golang.org/x/time v0.11.0 // indirect
179+
golang.org/x/tools v0.32.0 // indirect
180+
google.golang.org/genproto/googleapis/api v0.0.0-20250421163800-61c742ae3ef0 // indirect
181+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250421163800-61c742ae3ef0 // indirect
182+
google.golang.org/grpc v1.72.0 // indirect
183+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
184+
google.golang.org/protobuf v1.36.6 // indirect
185185
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
186186
gopkg.in/yaml.v3 v3.0.1 // indirect
187187
howett.net/plist v1.0.1 // indirect

0 commit comments

Comments
 (0)