From 9e94346529e1b03d5d1de1604dad88c15b4131ef Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 9 Jan 2023 14:00:10 +0800 Subject: [PATCH] Remove satori/go.uuid (#22375) `github.com/satori/go.uuid` is no longer used, so the `replace` is not needed now --- go.mod | 4 ++-- go.sum | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 64c293bc25..89c57dc761 100644 --- a/go.mod +++ b/go.mod @@ -303,8 +303,6 @@ replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1 replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0 -replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible - replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix exclude github.com/gofrs/uuid v3.2.0+incompatible @@ -312,3 +310,5 @@ exclude github.com/gofrs/uuid v3.2.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible exclude github.com/goccy/go-json v0.4.11 + +exclude github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index bde61a8c5b..72fc1c0503 100644 --- a/go.sum +++ b/go.sum @@ -596,7 +596,6 @@ github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=