From 6a4a520ff2df37075ab29fc8fa78cedd01e1d840 Mon Sep 17 00:00:00 2001 From: Ilya Ozherelyev Date: Mon, 25 Mar 2024 14:01:26 +0100 Subject: [PATCH 1/2] Upgrade apache thrift to a moder version --- cmd/server/go.mod | 3 --- go.mod | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cmd/server/go.mod b/cmd/server/go.mod index 8fdb20ee0eb..4991e73e53e 100644 --- a/cmd/server/go.mod +++ b/cmd/server/go.mod @@ -11,9 +11,6 @@ replace github.com/uber/cadence => ../.. replace github.com/uber/cadence/common/archiver/gcloud => ../../common/archiver/gcloud -// ringpop-go and tchannel-go depends on older version of thrift, yarpc brings up newer version -replace github.com/apache/thrift => github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 - require ( github.com/Shopify/sarama v1.33.0 // indirect github.com/VividCortex/mysqlerr v1.0.0 // indirect diff --git a/go.mod b/go.mod index 4a79790b609..1af6050b12f 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require github.com/google/gofuzz v1.0.0 require ( github.com/BurntSushi/toml v0.4.1 // indirect github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect - github.com/apache/thrift v0.16.0 // indirect + github.com/apache/thrift v0.17.0 // indirect github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect From 83ae79246c48994e6008074136f0263b1e4e4889 Mon Sep 17 00:00:00 2001 From: Ilya Ozherelyev Date: Mon, 25 Mar 2024 14:17:56 +0100 Subject: [PATCH 2/2] make tidy --- cmd/server/go.mod | 2 +- cmd/server/go.sum | 3 ++- common/archiver/gcloud/go.mod | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/server/go.mod b/cmd/server/go.mod index 4991e73e53e..0b8943ba2fe 100644 --- a/cmd/server/go.mod +++ b/cmd/server/go.mod @@ -79,7 +79,7 @@ require ( github.com/BurntSushi/toml v0.4.1 // indirect github.com/MicahParks/keyfunc/v2 v2.1.0 // indirect github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect - github.com/apache/thrift v0.16.0 // indirect + github.com/apache/thrift v0.17.0 // indirect github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/cmd/server/go.sum b/cmd/server/go.sum index 32ce2309c04..219949547d5 100644 --- a/cmd/server/go.sum +++ b/cmd/server/go.sum @@ -31,8 +31,9 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 h1:Fv9bK1Q+ly/ROk4aJsVMeuIwPel4bEnD8EPiI91nZMg= github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.17.0 h1:cMd2aj52n+8VoAtvSvLn4kDC3aZ6IAkBuqWQ2IDu7wo= +github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q= github.com/aws/aws-sdk-go v1.34.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.44.180 h1:VLZuAHI9fa/3WME5JjpVjcPCNfpGHVMiHx8sLHWhMgI= github.com/aws/aws-sdk-go v1.44.180/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= diff --git a/common/archiver/gcloud/go.mod b/common/archiver/gcloud/go.mod index c3b0b63dc77..ff668cf7367 100644 --- a/common/archiver/gcloud/go.mod +++ b/common/archiver/gcloud/go.mod @@ -60,7 +60,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.3 // indirect github.com/BurntSushi/toml v0.4.1 // indirect - github.com/apache/thrift v0.16.0 // indirect + github.com/apache/thrift v0.17.0 // indirect github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect