From 9ef93b8c22ffb696e5ef0e10267cd183c0baea29 Mon Sep 17 00:00:00 2001 From: "Xin.Zh" <dragoncharlie@foxmail.com> Date: Tue, 31 Dec 2019 22:59:58 +0800 Subject: [PATCH] Revert "upgrade hessian2 & gost v1.5" --- cluster/router/condition_router.go | 2 +- common/url.go | 2 +- config/graceful_shutdown.go | 2 +- config_center/configurator/override.go | 2 +- go.mod | 2 +- go.sum | 5 ++--- registry/protocol/protocol.go | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cluster/router/condition_router.go b/cluster/router/condition_router.go index ff1537fc7..efae65ccb 100644 --- a/cluster/router/condition_router.go +++ b/cluster/router/condition_router.go @@ -24,7 +24,7 @@ import ( ) import ( - gxset "github.com/dubbogo/gost/container/set" + "github.com/dubbogo/gost/container/gxset" gxnet "github.com/dubbogo/gost/net" perrors "github.com/pkg/errors" ) diff --git a/common/url.go b/common/url.go index e7762355a..c010298bf 100644 --- a/common/url.go +++ b/common/url.go @@ -31,7 +31,7 @@ import ( ) import ( - gxset "github.com/dubbogo/gost/container/set" + "github.com/dubbogo/gost/container/gxset" "github.com/jinzhu/copier" perrors "github.com/pkg/errors" "github.com/satori/go.uuid" diff --git a/config/graceful_shutdown.go b/config/graceful_shutdown.go index 83e2589c7..fedb2c15e 100644 --- a/config/graceful_shutdown.go +++ b/config/graceful_shutdown.go @@ -25,7 +25,7 @@ import ( ) import ( - gxset "github.com/dubbogo/gost/container/set" + "github.com/dubbogo/gost/container/gxset" ) import ( diff --git a/config_center/configurator/override.go b/config_center/configurator/override.go index 8e8fe5cc1..e85b4d3ec 100644 --- a/config_center/configurator/override.go +++ b/config_center/configurator/override.go @@ -21,7 +21,7 @@ import ( ) import ( - gxset "github.com/dubbogo/gost/container/set" + "github.com/dubbogo/gost/container/gxset" gxnet "github.com/dubbogo/gost/net" ) diff --git a/go.mod b/go.mod index 4c28f7ed9..c2a61f2db 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect github.com/creasty/defaults v1.3.0 github.com/dubbogo/getty v1.3.1 - github.com/dubbogo/gost v1.5.0 + github.com/dubbogo/gost v1.3.0 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect diff --git a/go.sum b/go.sum index d0f83409b..9855250a9 100644 --- a/go.sum +++ b/go.sum @@ -106,8 +106,8 @@ github.com/dubbogo/getty v1.3.1 h1:9fehwTo/D6+z6/+kADMbhbKeMkP80o/3g+XwV5lFLTY= github.com/dubbogo/getty v1.3.1/go.mod h1:dtLOEb1v6EMHsQNYRWEACiRLmTWB2kJGUAj1aXayPOg= github.com/dubbogo/gost v1.1.1 h1:JCM7vx5edPIjDA5ovJTuzEEXuw2t7xLyrlgi2mi5jHI= github.com/dubbogo/gost v1.1.1/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg= -github.com/dubbogo/gost v1.5.0 h1:Ubyi9WwZhlt1DQBpX6DWfQWP9/irmv5IGsMB2xYkHAQ= -github.com/dubbogo/gost v1.5.0/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8= +github.com/dubbogo/gost v1.3.0 h1:n90mIUWCPD69BqW8wJ43NDy0RgNxx02aAG4QJcJ785U= +github.com/dubbogo/gost v1.3.0/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg= github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 h1:2MIhn2R6oXQbgW5yHfS+d6YqyMfXiu2L55rFZC4UD/M= github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod h1:UqXY1lYT/ERa4OEAywUqdok1T4RCRdArkhic1Opuavo= github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0 h1:ZoRgc53qJCfSLimXqJDrmBhnt5GChDsExMCK7t48o0Y= @@ -449,7 +449,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/tebeka/strftime v0.1.3 h1:5HQXOqWKYRFfNyBMNVc9z5+QzuBtIXy03psIhtdJYto= github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ= github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod h1:RHkNRtSLfOK7qBTHaeSX1D6BNpI3qw7NTxsmNr4RvN8= -github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0= github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZMibh0H/k= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go index 8655312a4..534a4b945 100644 --- a/registry/protocol/protocol.go +++ b/registry/protocol/protocol.go @@ -23,7 +23,7 @@ import ( ) import ( - gxset "github.com/dubbogo/gost/container/set" + "github.com/dubbogo/gost/container/gxset" ) import ( -- GitLab