Skip to content

Commit e5b61bb

Browse files
mornyxmornyx
committed
go mod tidy
Signed-off-by: mornyx <[email protected]>
1 parent 7160521 commit e5b61bb

File tree

2 files changed

+43
-254
lines changed

2 files changed

+43
-254
lines changed

‎go.mod‎

Lines changed: 17 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ require (
2424
github.com/prometheus/client_golang v1.14.0
2525
github.com/prometheus/common v0.39.0
2626
github.com/spf13/pflag v1.0.5
27-
<<<<<<< HEAD
28-
github.com/stretchr/testify v1.8.3
27+
github.com/stretchr/testify v1.10.0
2928
github.com/valyala/gozstd v1.16.0
3029
github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
3130
go.etcd.io/etcd/api/v3 v3.5.7
@@ -35,22 +34,8 @@ require (
3534
go.uber.org/atomic v1.10.0
3635
go.uber.org/goleak v1.2.0
3736
go.uber.org/zap v1.24.0
38-
golang.org/x/net v0.17.0
39-
google.golang.org/grpc v1.58.3
40-
=======
41-
github.com/stretchr/testify v1.10.0
42-
github.com/valyala/gozstd v1.16.0
43-
github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
44-
go.etcd.io/etcd/api/v3 v3.5.12
45-
go.etcd.io/etcd/client/pkg/v3 v3.5.12
46-
go.etcd.io/etcd/client/v3 v3.5.12
47-
go.etcd.io/etcd/tests/v3 v3.5.12
48-
go.uber.org/atomic v1.11.0
49-
go.uber.org/goleak v1.3.0
50-
go.uber.org/zap v1.27.0
5137
golang.org/x/net v0.33.0
52-
google.golang.org/grpc v1.62.1
53-
>>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
38+
google.golang.org/grpc v1.58.3
5439
)
5540

5641
require (
@@ -64,22 +49,13 @@ require (
6449
github.com/benbjohnson/clock v1.3.0 // indirect
6550
github.com/beorn7/perks v1.0.1 // indirect
6651
github.com/buger/jsonparser v1.1.1 // indirect
67-
<<<<<<< HEAD
68-
github.com/bytedance/sonic v1.9.1 // indirect
69-
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
70-
github.com/cespare/xxhash v1.1.0 // indirect
71-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
72-
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
73-
=======
7452
github.com/bytedance/sonic v1.12.6 // indirect
7553
github.com/bytedance/sonic/loader v0.2.1 // indirect
76-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
54+
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
7755
github.com/cespare/xxhash v1.1.0 // indirect
7856
github.com/cespare/xxhash/v2 v2.2.0 // indirect
79-
github.com/cloudfoundry/gosigar v1.3.6 // indirect
8057
github.com/cloudwego/base64x v0.1.4 // indirect
8158
github.com/cloudwego/iasm v0.2.0 // indirect
82-
>>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
8359
github.com/cockroachdb/errors v1.8.1 // indirect
8460
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
8561
github.com/cockroachdb/redact v1.0.8 // indirect
@@ -94,27 +70,14 @@ require (
9470
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
9571
github.com/dustin/go-humanize v1.0.0 // indirect
9672
github.com/fogleman/gg v1.3.0 // indirect
97-
<<<<<<< HEAD
98-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
99-
github.com/gin-contrib/sse v0.1.0 // indirect
100-
github.com/go-ole/go-ole v1.2.6 // indirect
101-
github.com/go-playground/locales v0.14.1 // indirect
102-
github.com/go-playground/universal-translator v0.18.1 // indirect
103-
github.com/go-playground/validator/v10 v10.14.0 // indirect
104-
github.com/go-resty/resty/v2 v2.6.0 // indirect
105-
github.com/goccy/go-json v0.10.2 // indirect
106-
=======
107-
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
73+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
10874
github.com/gin-contrib/sse v1.0.0 // indirect
109-
github.com/go-logr/logr v1.4.1 // indirect
110-
github.com/go-logr/stdr v1.2.2 // indirect
111-
github.com/go-ole/go-ole v1.3.0 // indirect
75+
github.com/go-ole/go-ole v1.2.6 // indirect
11276
github.com/go-playground/locales v0.14.1 // indirect
11377
github.com/go-playground/universal-translator v0.18.1 // indirect
11478
github.com/go-playground/validator/v10 v10.23.0 // indirect
115-
github.com/go-resty/resty/v2 v2.11.0 // indirect
79+
github.com/go-resty/resty/v2 v2.6.0 // indirect
11680
github.com/goccy/go-json v0.10.4 // indirect
117-
>>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
11881
github.com/gogo/protobuf v1.3.2 // indirect
11982
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
12083
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
@@ -132,31 +95,20 @@ require (
13295
github.com/joomcode/errorx v1.0.1 // indirect
13396
github.com/jpillora/backoff v1.0.0 // indirect
13497
github.com/json-iterator/go v1.1.12 // indirect
135-
<<<<<<< HEAD
13698
github.com/klauspost/compress v1.15.13 // indirect
137-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
138-
github.com/kr/pretty v0.3.0 // indirect
139-
github.com/kr/text v0.2.0 // indirect
140-
github.com/leodido/go-urn v1.2.4 // indirect
141-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
142-
github.com/mattn/go-isatty v0.0.19 // indirect
143-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
144-
=======
145-
github.com/klauspost/compress v1.17.4 // indirect
14699
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
147-
github.com/kr/pretty v0.3.1 // indirect
100+
github.com/kr/pretty v0.3.0 // indirect
148101
github.com/kr/text v0.2.0 // indirect
149102
github.com/leodido/go-urn v1.4.0 // indirect
150-
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
103+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
151104
github.com/mattn/go-isatty v0.0.20 // indirect
152-
>>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
105+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
153106
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
154107
github.com/modern-go/reflect2 v1.0.2 // indirect
155108
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
156109
github.com/opentracing/basictracer-go v1.0.0 // indirect
157110
github.com/opentracing/opentracing-go v1.2.0 // indirect
158-
<<<<<<< HEAD
159-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
111+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
160112
github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32 // indirect
161113
github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3 // indirect
162114
github.com/pingcap/tidb/parser v0.0.0-20230302035309-11148627b1e6 // indirect
@@ -168,27 +120,9 @@ require (
168120
github.com/rogpeppe/go-internal v1.8.0 // indirect
169121
github.com/shirou/gopsutil/v3 v3.22.12 // indirect
170122
github.com/sirupsen/logrus v1.9.0 // indirect
171-
=======
172-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
173-
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
174-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f // indirect
175-
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
176-
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5 // indirect
177-
github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e // indirect
178-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
179-
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
180-
github.com/prometheus/client_model v0.6.0 // indirect
181-
github.com/prometheus/procfs v0.13.0 // indirect
182-
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
183-
github.com/rogpeppe/go-internal v1.11.0 // indirect
184-
github.com/sasha-s/go-deadlock v0.3.1 // indirect
185-
github.com/shirou/gopsutil/v3 v3.24.2 // indirect
186-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
187-
github.com/sirupsen/logrus v1.9.3 // indirect
188-
>>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
189123
github.com/soheilhy/cmux v0.1.5 // indirect
190124
github.com/stathat/consistent v1.0.0 // indirect
191-
github.com/stretchr/objx v0.5.0 // indirect
125+
github.com/stretchr/objx v0.5.2 // indirect
192126
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
193127
github.com/tikv/client-go/v2 v2.0.5-0.20230202101145-8fd09cd88cce // indirect
194128
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f // indirect
@@ -217,7 +151,6 @@ require (
217151
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
218152
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
219153
go.opencensus.io v0.24.0 // indirect
220-
<<<<<<< HEAD
221154
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
222155
go.opentelemetry.io/otel v1.0.1 // indirect
223156
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
@@ -226,47 +159,21 @@ require (
226159
go.opentelemetry.io/otel/trace v1.0.1 // indirect
227160
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
228161
go.uber.org/multierr v1.9.0 // indirect
229-
golang.org/x/arch v0.3.0 // indirect
230-
golang.org/x/crypto v0.14.0 // indirect
162+
golang.org/x/arch v0.13.0 // indirect
163+
golang.org/x/crypto v0.31.0 // indirect
231164
golang.org/x/exp v0.0.0-20221023144134-a1e5550cf13e // indirect
232165
golang.org/x/image v0.5.0 // indirect
233166
golang.org/x/oauth2 v0.10.0 // indirect
234-
golang.org/x/sync v0.3.0 // indirect
235-
golang.org/x/sys v0.13.0 // indirect
236-
golang.org/x/text v0.13.0 // indirect
167+
golang.org/x/sync v0.10.0 // indirect
168+
golang.org/x/sys v0.29.0 // indirect
169+
golang.org/x/text v0.21.0 // indirect
237170
golang.org/x/time v0.3.0 // indirect
238171
google.golang.org/appengine v1.6.7 // indirect
239172
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
240173
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
241174
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
242-
google.golang.org/protobuf v1.31.0 // indirect
243-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
244-
=======
245-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
246-
go.opentelemetry.io/otel v1.22.0 // indirect
247-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
248-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
249-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
250-
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
251-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
252-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
253-
go.uber.org/multierr v1.11.0 // indirect
254-
golang.org/x/arch v0.12.0 // indirect
255-
golang.org/x/crypto v0.31.0 // indirect
256-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
257-
golang.org/x/image v0.5.0 // indirect
258-
golang.org/x/oauth2 v0.18.0 // indirect
259-
golang.org/x/sync v0.10.0 // indirect
260-
golang.org/x/sys v0.28.0 // indirect
261-
golang.org/x/text v0.21.0 // indirect
262-
golang.org/x/time v0.5.0 // indirect
263-
google.golang.org/appengine v1.6.8 // indirect
264-
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
265-
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
266-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 // indirect
267175
google.golang.org/protobuf v1.36.1 // indirect
268-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
269-
>>>>>>> 82a94ec (*: update gin to v1.10.0 (#280))
176+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
270177
gopkg.in/yaml.v2 v2.4.0 // indirect
271178
gopkg.in/yaml.v3 v3.0.1 // indirect
272179
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)