Skip to content

Commit 185e54d

Browse files
aeneasraeneasr
committed
Revert "chore: synchronize workspaces"
This reverts commit 9d222e5.
1 parent 47f6115 commit 185e54d

File tree

2 files changed

+197
-68
lines changed

2 files changed

+197
-68
lines changed

‎go.mod‎

Lines changed: 67 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/ory/hydra/v2
22

3-
go 1.22
3+
go 1.23
44

5-
toolchain go1.22.5
5+
toolchain go1.23.3
66

77
replace github.com/ory/hydra-client-go/v2 => ./internal/httpclient
88

@@ -13,7 +13,7 @@ require (
1313
github.com/bradleyjkemp/cupaloy/v2 v2.8.0
1414
github.com/cenkalti/backoff/v3 v3.2.2
1515
github.com/fatih/structs v1.1.0
16-
github.com/go-faker/faker/v4 v4.4.2
16+
github.com/go-faker/faker/v4 v4.5.0
1717
github.com/go-jose/go-jose/v3 v3.0.3
1818
github.com/go-swagger/go-swagger v0.31.0
1919
github.com/gobuffalo/pop/v6 v6.1.2-0.20230318123913-c85387acc9a0
@@ -23,15 +23,15 @@ require (
2323
github.com/golang/mock v1.6.0
2424
github.com/google/uuid v1.6.0
2525
github.com/gorilla/securecookie v1.1.2
26-
github.com/gorilla/sessions v1.3.0
26+
github.com/gorilla/sessions v1.4.0
2727
github.com/hashicorp/go-retryablehttp v0.7.7
28-
github.com/jackc/pgx/v5 v5.6.0
28+
github.com/jackc/pgx/v5 v5.7.2
2929
github.com/julienschmidt/httprouter v1.3.0
3030
github.com/luna-duclos/instrumentedsql v1.1.3
3131
github.com/miekg/pkcs11 v1.1.1
32-
github.com/mikefarah/yq/v4 v4.44.2
32+
github.com/mikefarah/yq/v4 v4.44.6
3333
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
34-
github.com/oleiade/reflections v1.0.1
34+
github.com/oleiade/reflections v1.1.0
3535
github.com/ory/analytics-go/v5 v5.0.1
3636
github.com/ory/fosite v0.49.0
3737
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe
@@ -40,33 +40,33 @@ require (
4040
github.com/ory/hydra-client-go/v2 v2.2.1
4141
github.com/ory/jsonschema/v3 v3.0.8
4242
github.com/ory/kratos-client-go v1.2.1
43-
github.com/ory/x v0.0.675
43+
github.com/ory/x v0.0.689
4444
github.com/pborman/uuid v1.2.1
4545
github.com/pkg/errors v0.9.1
46-
github.com/prometheus/client_golang v1.19.1
47-
github.com/rs/cors v1.11.0
46+
github.com/prometheus/client_golang v1.20.5
47+
github.com/rs/cors v1.11.1
4848
github.com/sawadashota/encrypta v0.0.5
4949
github.com/sirupsen/logrus v1.9.3
5050
github.com/spf13/cobra v1.8.1
5151
github.com/spf13/pflag v1.0.5
52-
github.com/stretchr/testify v1.9.0
53-
github.com/tidwall/gjson v1.17.3
52+
github.com/stretchr/testify v1.10.0
53+
github.com/tidwall/gjson v1.18.0
5454
github.com/tidwall/sjson v1.2.5
5555
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
5656
github.com/toqueteos/webbrowser v1.2.0
5757
github.com/twmb/murmur3 v1.1.8
5858
github.com/urfave/negroni v1.0.0
59-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
60-
go.opentelemetry.io/otel v1.32.0
61-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0
62-
go.opentelemetry.io/otel/sdk v1.32.0
63-
go.opentelemetry.io/otel/trace v1.32.0
64-
go.uber.org/automaxprocs v1.5.3
65-
golang.org/x/crypto v0.31.0
66-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
67-
golang.org/x/oauth2 v0.23.0
59+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
60+
go.opentelemetry.io/otel v1.33.0
61+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0
62+
go.opentelemetry.io/otel/sdk v1.33.0
63+
go.opentelemetry.io/otel/trace v1.33.0
64+
go.uber.org/automaxprocs v1.6.0
65+
golang.org/x/crypto v0.32.0
66+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
67+
golang.org/x/oauth2 v0.25.0
6868
golang.org/x/sync v0.10.0
69-
golang.org/x/tools v0.23.0
69+
golang.org/x/tools v0.29.0
7070
)
7171

7272
require (
@@ -75,13 +75,13 @@ require (
7575
filippo.io/edwards25519 v1.1.0 // indirect
7676
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7777
github.com/Masterminds/goutils v1.1.1 // indirect
78-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
78+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
7979
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
8080
github.com/Microsoft/go-winio v0.6.2 // indirect
8181
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
82-
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
82+
github.com/ProtonMail/go-crypto v1.1.4 // indirect
8383
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
84-
github.com/ProtonMail/gopenpgp/v2 v2.7.5 // indirect
84+
github.com/ProtonMail/gopenpgp/v2 v2.8.2 // indirect
8585
github.com/a8m/envsubst v1.4.2 // indirect
8686
github.com/alecthomas/participle/v2 v2.1.1 // indirect
8787
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -90,7 +90,7 @@ require (
9090
github.com/beorn7/perks v1.0.1 // indirect
9191
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
9292
github.com/cespare/xxhash/v2 v2.3.0 // indirect
93-
github.com/cloudflare/circl v1.3.7 // indirect
93+
github.com/cloudflare/circl v1.5.0 // indirect
9494
github.com/cockroachdb/cockroach-go/v2 v2.3.5 // indirect
9595
github.com/containerd/continuity v0.4.3 // indirect
9696
github.com/cristalhq/jwt/v4 v4.0.2 // indirect
@@ -103,12 +103,12 @@ require (
103103
github.com/docker/go-connections v0.5.0 // indirect
104104
github.com/docker/go-units v0.5.0 // indirect
105105
github.com/dustin/go-humanize v1.0.1 // indirect
106-
github.com/elliotchance/orderedmap v1.6.0 // indirect
106+
github.com/elliotchance/orderedmap v1.8.0 // indirect
107107
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
108-
github.com/fatih/color v1.17.0 // indirect
108+
github.com/fatih/color v1.18.0 // indirect
109109
github.com/felixge/fgprof v0.9.3 // indirect
110110
github.com/felixge/httpsnoop v1.0.4 // indirect
111-
github.com/fsnotify/fsnotify v1.7.0 // indirect
111+
github.com/fsnotify/fsnotify v1.8.0 // indirect
112112
github.com/go-logr/logr v1.4.2 // indirect
113113
github.com/go-logr/stdr v1.2.2 // indirect
114114
github.com/go-openapi/analysis v0.23.0 // indirect
@@ -125,25 +125,25 @@ require (
125125
github.com/go-sql-driver/mysql v1.8.1 // indirect
126126
github.com/gobuffalo/envy v1.10.2 // indirect
127127
github.com/gobuffalo/fizz v1.14.4 // indirect
128-
github.com/gobuffalo/flect v1.0.2 // indirect
128+
github.com/gobuffalo/flect v1.0.3 // indirect
129129
github.com/gobuffalo/github_flavored_markdown v1.1.4 // indirect
130130
github.com/gobuffalo/helpers v0.6.7 // indirect
131131
github.com/gobuffalo/nulls v0.4.2 // indirect
132-
github.com/gobuffalo/plush/v4 v4.1.21 // indirect
132+
github.com/gobuffalo/plush/v4 v4.1.22 // indirect
133133
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
134134
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
135-
github.com/goccy/go-json v0.10.3 // indirect
136-
github.com/goccy/go-yaml v1.11.3 // indirect
135+
github.com/goccy/go-json v0.10.4 // indirect
136+
github.com/goccy/go-yaml v1.15.13 // indirect
137137
github.com/gofrs/flock v0.8.1 // indirect
138138
github.com/gogo/protobuf v1.3.2 // indirect
139139
github.com/golang/protobuf v1.5.4 // indirect
140140
github.com/google/pprof v0.0.0-20230808223545-4887780b67fb // indirect
141141
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
142142
github.com/gorilla/css v1.0.1 // indirect
143143
github.com/gorilla/handlers v1.5.2 // indirect
144-
github.com/gorilla/websocket v1.5.0 // indirect
144+
github.com/gorilla/websocket v1.5.3 // indirect
145145
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
146-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
146+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
147147
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
148148
github.com/hashicorp/hcl v1.0.0 // indirect
149149
github.com/huandu/xstrings v1.4.0 // indirect
@@ -156,8 +156,8 @@ require (
156156
github.com/jackc/pgpassfile v1.0.0 // indirect
157157
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
158158
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
159-
github.com/jackc/puddle/v2 v2.2.1 // indirect
160-
github.com/jandelgado/gcov2lcov v1.0.5 // indirect
159+
github.com/jackc/puddle/v2 v2.2.2 // indirect
160+
github.com/jandelgado/gcov2lcov v1.1.1 // indirect
161161
github.com/jessevdk/go-flags v1.5.0 // indirect
162162
github.com/jinzhu/copier v0.4.0 // indirect
163163
github.com/jmoiron/sqlx v1.4.0 // indirect
@@ -173,19 +173,19 @@ require (
173173
github.com/kr/pretty v0.3.1 // indirect
174174
github.com/kr/text v0.2.0 // indirect
175175
github.com/lib/pq v1.10.9 // indirect
176-
github.com/magiconair/properties v1.8.7 // indirect
176+
github.com/magiconair/properties v1.8.9 // indirect
177177
github.com/mailru/easyjson v0.7.7 // indirect
178-
github.com/mattn/go-colorable v0.1.13 // indirect
178+
github.com/mattn/go-colorable v0.1.14 // indirect
179179
github.com/mattn/go-isatty v0.0.20 // indirect
180-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
180+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
181181
github.com/mattn/goveralls v0.0.12 // indirect
182-
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
182+
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
183183
github.com/mitchellh/copystructure v1.2.0 // indirect
184184
github.com/mitchellh/mapstructure v1.5.0 // indirect
185185
github.com/mitchellh/reflectwalk v1.0.2 // indirect
186186
github.com/moby/docker-image-spec v1.3.1 // indirect
187187
github.com/moby/term v0.5.0 // indirect
188-
github.com/nyaruka/phonenumbers v1.1.7 // indirect
188+
github.com/nyaruka/phonenumbers v1.4.4 // indirect
189189
github.com/oklog/ulid v1.3.1 // indirect
190190
github.com/opencontainers/go-digest v1.0.0 // indirect
191191
github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -194,25 +194,25 @@ require (
194194
github.com/ory/dockertest/v3 v3.10.1-0.20240704115616-d229e74b748d // indirect
195195
github.com/ory/go-convenience v0.1.0 // indirect
196196
github.com/pelletier/go-toml v1.9.5 // indirect
197-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
197+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
198198
github.com/pkg/profile v1.7.0 // indirect
199199
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
200-
github.com/prometheus/client_model v0.5.0 // indirect
201-
github.com/prometheus/common v0.48.0 // indirect
202-
github.com/prometheus/procfs v0.12.0 // indirect
200+
github.com/prometheus/client_model v0.6.1 // indirect
201+
github.com/prometheus/common v0.55.0 // indirect
202+
github.com/prometheus/procfs v0.15.1 // indirect
203203
github.com/rogpeppe/go-internal v1.13.1 // indirect
204-
github.com/sagikazarmark/locafero v0.4.0 // indirect
204+
github.com/sagikazarmark/locafero v0.7.0 // indirect
205205
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
206206
github.com/seatgeek/logrus-gelf-formatter v0.0.0-20210414080842-5b05eb8ff761 // indirect
207-
github.com/segmentio/backo-go v1.0.1 // indirect
207+
github.com/segmentio/backo-go v1.1.0 // indirect
208208
github.com/sergi/go-diff v1.3.1 // indirect
209209
github.com/shopspring/decimal v1.3.1 // indirect
210210
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
211211
github.com/sourcegraph/conc v0.3.0 // indirect
212212
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
213-
github.com/spf13/afero v1.11.0 // indirect
214-
github.com/spf13/cast v1.6.0 // indirect
215-
github.com/spf13/viper v1.18.2 // indirect
213+
github.com/spf13/afero v1.12.0 // indirect
214+
github.com/spf13/cast v1.7.1 // indirect
215+
github.com/spf13/viper v1.19.0 // indirect
216216
github.com/subosito/gotenv v1.6.0 // indirect
217217
github.com/thales-e-security/pool v0.0.2 // indirect
218218
github.com/tidwall/match v1.1.1 // indirect
@@ -223,25 +223,26 @@ require (
223223
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
224224
github.com/yuin/gopher-lua v1.1.1 // indirect
225225
go.mongodb.org/mongo-driver v1.14.0 // indirect
226-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.57.0 // indirect
227-
go.opentelemetry.io/contrib/propagators/b3 v1.32.0 // indirect
228-
go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 // indirect
229-
go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0 // indirect
226+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
227+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.58.0 // indirect
228+
go.opentelemetry.io/contrib/propagators/b3 v1.33.0 // indirect
229+
go.opentelemetry.io/contrib/propagators/jaeger v1.33.0 // indirect
230+
go.opentelemetry.io/contrib/samplers/jaegerremote v0.27.0 // indirect
230231
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
231-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
232-
go.opentelemetry.io/otel/exporters/zipkin v1.32.0 // indirect
233-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
234-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
232+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
233+
go.opentelemetry.io/otel/exporters/zipkin v1.33.0 // indirect
234+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
235+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
235236
go.uber.org/multierr v1.11.0 // indirect
236-
golang.org/x/mod v0.19.0 // indirect
237-
golang.org/x/net v0.33.0 // indirect
238-
golang.org/x/sys v0.28.0 // indirect
237+
golang.org/x/mod v0.22.0 // indirect
238+
golang.org/x/net v0.34.0 // indirect
239+
golang.org/x/sys v0.29.0 // indirect
239240
golang.org/x/text v0.21.0 // indirect
240241
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
241-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
242-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
243-
google.golang.org/grpc v1.67.1 // indirect
244-
google.golang.org/protobuf v1.35.1 // indirect
242+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
243+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
244+
google.golang.org/grpc v1.69.2 // indirect
245+
google.golang.org/protobuf v1.36.2 // indirect
245246
gopkg.in/ini.v1 v1.67.0 // indirect
246247
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
247248
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)