Skip to content

Commit db4ed94

Browse files
committed
chore: resolve go mod and sum conflicts
1 parent 5cfe2ba commit db4ed94

2 files changed

Lines changed: 63 additions & 64 deletions

File tree

go.mod

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ require (
2323

2424
require (
2525
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
26-
github.com/BurntSushi/toml v1.5.0 // indirect
26+
github.com/BurntSushi/toml v1.4.0 // indirect
2727
github.com/Masterminds/goutils v1.1.1 // indirect
28-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
28+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2929
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3030
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
3131
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
@@ -38,7 +38,7 @@ require (
3838
github.com/goccy/go-yaml v1.18.0 // indirect
3939
github.com/google/go-cmp v0.7.0 // indirect
4040
github.com/huandu/xstrings v1.5.0 // indirect
41-
github.com/imdario/mergo v0.3.16 // indirect
41+
github.com/imdario/mergo v0.3.11 // indirect
4242
github.com/jinzhu/inflection v1.0.0 // indirect
4343
github.com/jinzhu/now v1.1.5 // indirect
4444
github.com/mattn/go-sqlite3 v1.14.32 // indirect
@@ -47,19 +47,17 @@ require (
4747
github.com/moby/sys/atomicwriter v0.1.0 // indirect
4848
github.com/moby/term v0.5.2 // indirect
4949
github.com/ncruces/go-strftime v0.1.9 // indirect
50-
github.com/quic-go/qpack v0.6.0 // indirect
51-
github.com/quic-go/quic-go v0.57.1 // indirect
50+
github.com/quic-go/qpack v0.5.1 // indirect
51+
github.com/quic-go/quic-go v0.54.1 // indirect
5252
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
5353
github.com/shopspring/decimal v1.4.0 // indirect
5454
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
5555
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
56-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
57-
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
58-
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
56+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
57+
go.uber.org/mock v0.5.0 // indirect
58+
golang.org/x/mod v0.30.0 // indirect
5959
golang.org/x/term v0.38.0 // indirect
60-
golang.org/x/time v0.14.0 // indirect
61-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
62-
google.golang.org/grpc v1.76.0 // indirect
60+
golang.org/x/tools v0.39.0 // indirect
6361
gopkg.in/yaml.v3 v3.0.1 // indirect
6462
modernc.org/libc v1.66.3 // indirect
6563
modernc.org/mathutil v1.7.1 // indirect
@@ -99,7 +97,7 @@ require (
9997
github.com/go-playground/locales v0.14.1 // indirect
10098
github.com/go-playground/universal-translator v0.18.1 // indirect
10199
github.com/goccy/go-json v0.10.4 // indirect
102-
github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12 // indirect
100+
github.com/json-iterator/go v1.1.12 // indirect
103101
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
104102
github.com/leodido/go-urn v1.4.0 // indirect
105103
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -110,12 +108,12 @@ require (
110108
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
111109
github.com/moby/docker-image-spec v1.3.1 // indirect
112110
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113-
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
111+
github.com/modern-go/reflect2 v1.0.2 // indirect
114112
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
115113
github.com/muesli/cancelreader v0.2.2 // indirect
116114
github.com/muesli/termenv v0.16.0 // indirect
117115
github.com/opencontainers/go-digest v1.0.0 // indirect
118-
github.com/opencontainers/image-spec v1.1.1 // indirect
116+
github.com/opencontainers/image-spec v1.1.0 // indirect
119117
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
120118
github.com/pkg/errors v0.9.1 // indirect
121119
github.com/pquerna/otp v1.5.0
@@ -124,14 +122,14 @@ require (
124122
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
125123
github.com/ugorji/go/codec v1.3.0 // indirect
126124
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
127-
go.opentelemetry.io/otel v1.38.0 // indirect
128-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
129-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
125+
go.opentelemetry.io/otel v1.37.0 // indirect
126+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
127+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
130128
golang.org/x/arch v0.20.0 // indirect
131129
golang.org/x/net v0.47.0 // indirect
132130
golang.org/x/oauth2 v0.34.0
133131
golang.org/x/sync v0.19.0 // indirect
134132
golang.org/x/sys v0.39.0 // indirect
135133
golang.org/x/text v0.32.0 // indirect
136-
google.golang.org/protobuf v1.36.10 // indirect
134+
google.golang.org/protobuf v1.36.9 // indirect
137135
)

0 commit comments

Comments
 (0)