Skip to content

Commit d5099cb

Browse files
authored
chore: remove fosite branch override (#3599)
1 parent 339bf40 commit d5099cb

File tree

2 files changed

+106
-32
lines changed

2 files changed

+106
-32
lines changed

go.mod

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ replace (
1313

1414
replace github.com/ory/hydra-client-go/v2 => ./internal/httpclient
1515

16-
// TODO(hperl): remove!
17-
replace github.com/ory/fosite => github.com/ory/fosite v0.44.1-0.20230724105914-bc7e3385d777
18-
1916
require (
2017
github.com/ThalesIgnite/crypto11 v1.2.4
2118
github.com/bradleyjkemp/cupaloy/v2 v2.8.0
@@ -41,13 +38,13 @@ require (
4138
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
4239
github.com/oleiade/reflections v1.0.1
4340
github.com/ory/analytics-go/v5 v5.0.1
44-
github.com/ory/fosite v0.44.1-0.20230704083823-8098e48b2e09
41+
github.com/ory/fosite v0.44.1-0.20230807113540-d4605bb2b3a6
4542
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe
4643
github.com/ory/graceful v0.1.3
4744
github.com/ory/herodot v0.10.3-0.20230626083119-d7e5192f0d88
4845
github.com/ory/hydra-client-go/v2 v2.1.1
4946
github.com/ory/jsonschema/v3 v3.0.8
50-
github.com/ory/x v0.0.574
47+
github.com/ory/x v0.0.575
5148
github.com/pborman/uuid v1.2.1
5249
github.com/pkg/errors v0.9.1
5350
github.com/prometheus/client_golang v1.13.0
@@ -56,24 +53,24 @@ require (
5653
github.com/sirupsen/logrus v1.9.0
5754
github.com/spf13/cobra v1.7.0
5855
github.com/spf13/pflag v1.0.5
59-
github.com/stretchr/testify v1.8.3
56+
github.com/stretchr/testify v1.8.4
6057
github.com/tidwall/gjson v1.14.3
6158
github.com/tidwall/sjson v1.2.5
6259
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
6360
github.com/toqueteos/webbrowser v1.2.0
6461
github.com/twmb/murmur3 v1.1.6
6562
github.com/urfave/negroni v1.0.0
66-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4
67-
go.opentelemetry.io/otel v1.11.1
68-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.9.0
69-
go.opentelemetry.io/otel/sdk v1.11.1
70-
go.opentelemetry.io/otel/trace v1.11.1
63+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
64+
go.opentelemetry.io/otel v1.16.0
65+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0
66+
go.opentelemetry.io/otel/sdk v1.16.0
67+
go.opentelemetry.io/otel/trace v1.16.0
7168
go.uber.org/automaxprocs v1.3.0
7269
golang.org/x/crypto v0.11.0
7370
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
7471
golang.org/x/oauth2 v0.10.0
7572
golang.org/x/sync v0.3.0
76-
golang.org/x/tools v0.10.0
73+
golang.org/x/tools v0.11.1
7774
)
7875

7976
require github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -89,7 +86,7 @@ require (
8986
github.com/avast/retry-go/v4 v4.3.0 // indirect
9087
github.com/aymerick/douceur v0.2.0 // indirect
9188
github.com/beorn7/perks v1.0.1 // indirect
92-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
89+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
9390
github.com/cespare/xxhash/v2 v2.2.0 // indirect
9491
github.com/cockroachdb/cockroach-go/v2 v2.2.16 // indirect
9592
github.com/containerd/continuity v0.3.0 // indirect
@@ -112,7 +109,7 @@ require (
112109
github.com/felixge/fgprof v0.9.3 // indirect
113110
github.com/felixge/httpsnoop v1.0.3 // indirect
114111
github.com/fsnotify/fsnotify v1.6.0 // indirect
115-
github.com/go-logr/logr v1.2.3 // indirect
112+
github.com/go-logr/logr v1.2.4 // indirect
116113
github.com/go-logr/stdr v1.2.2 // indirect
117114
github.com/go-openapi/analysis v0.21.4 // indirect
118115
github.com/go-openapi/errors v0.20.3 // indirect
@@ -146,7 +143,7 @@ require (
146143
github.com/gorilla/handlers v1.5.1 // indirect
147144
github.com/gorilla/websocket v1.5.0 // indirect
148145
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
149-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect
146+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
150147
github.com/hashicorp/hcl v1.0.0 // indirect
151148
github.com/huandu/xstrings v1.3.2 // indirect
152149
github.com/imdario/mergo v0.3.13 // indirect
@@ -196,7 +193,7 @@ require (
196193
github.com/ory/dockertest/v3 v3.9.1 // indirect
197194
github.com/ory/go-convenience v0.1.0 // indirect
198195
github.com/pelletier/go-toml v1.9.5 // indirect
199-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
196+
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
200197
github.com/pkg/profile v1.7.0 // indirect
201198
github.com/pmezard/go-difflib v1.0.0 // indirect
202199
github.com/prometheus/client_model v0.3.0 // indirect
@@ -224,29 +221,30 @@ require (
224221
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
225222
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
226223
go.mongodb.org/mongo-driver v1.10.3 // indirect
227-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.36.4 // indirect
228-
go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect
229-
go.opentelemetry.io/contrib/propagators/jaeger v1.11.1 // indirect
230-
go.opentelemetry.io/contrib/samplers/jaegerremote v0.5.2 // indirect
231-
go.opentelemetry.io/otel/exporters/jaeger v1.11.1 // indirect
232-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.1 // indirect
233-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.9.0 // indirect
234-
go.opentelemetry.io/otel/exporters/zipkin v1.11.1 // indirect
235-
go.opentelemetry.io/otel/metric v0.33.0 // indirect
236-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
237-
golang.org/x/mod v0.11.0 // indirect
238-
golang.org/x/net v0.12.0 // indirect
224+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.42.0 // indirect
225+
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
226+
go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 // indirect
227+
go.opentelemetry.io/contrib/samplers/jaegerremote v0.11.0 // indirect
228+
go.opentelemetry.io/otel/exporters/jaeger v1.16.0 // indirect
229+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
230+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
231+
go.opentelemetry.io/otel/exporters/zipkin v1.16.0 // indirect
232+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
233+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
234+
golang.org/x/mod v0.12.0 // indirect
235+
golang.org/x/net v0.13.0 // indirect
239236
golang.org/x/sys v0.10.0 // indirect
240237
golang.org/x/text v0.11.0 // indirect
241238
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
242239
google.golang.org/appengine v1.6.7 // indirect
243-
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
244-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
245-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
246-
google.golang.org/grpc v1.55.0 // indirect
240+
google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf // indirect
241+
google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf // indirect
242+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
243+
google.golang.org/grpc v1.57.0 // indirect
247244
google.golang.org/protobuf v1.31.0 // indirect
248245
gopkg.in/ini.v1 v1.67.0 // indirect
249246
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
247+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
250248
gopkg.in/yaml.v2 v2.4.0 // indirect
251249
gopkg.in/yaml.v3 v3.0.1 // indirect
252250
)

0 commit comments

Comments
 (0)