From 81e44182c56988a46f20e6d9564892319232ce99 Mon Sep 17 00:00:00 2001 From: Deng Ming Date: Mon, 28 Feb 2022 21:24:08 +0800 Subject: [PATCH] upgrade redisgo to v1.8.8 --- CHANGELOG.md | 6 ++++-- go.mod | 20 ++++---------------- go.sum | 2 -- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72eb9904..920ac9d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # developing -- [https://github.com/beego/beego/pull/4845](https://github.com/beego/beego/pull/4845) +- [upgrade redisgo to v1.8.8](https://github.com/beego/beego/pull/4872) +# v2.0.2 +See v2.0.2-beta.1 +- [fix bug: etcd should use etcd as adapter name](https://github.com/beego/beego/pull/4845) # v2.0.2-beta.1 - - Add a custom option for whether to escape HTML special characters when processing http request parameters. [4701](https://github.com/beego/beego/pull/4701) - Always set the response status in the CustomAbort function. [4686](https://github.com/beego/beego/pull/4686) - Add template functions eq,lt to support uint and int compare. [4607](https://github.com/beego/beego/pull/4607) diff --git a/go.mod b/go.mod index e2cbd42e..2f009d9f 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,6 @@ module github.com/beego/beego/v2 go 1.14 require ( - github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect - github.com/alicebob/miniredis v2.5.0+incompatible // indirect github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/casbin/casbin v1.9.1 @@ -12,43 +10,33 @@ require ( github.com/couchbase/go-couchbase v0.1.0 github.com/couchbase/gomemcached v0.1.3 // indirect github.com/couchbase/goutils v0.1.0 // indirect - github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76 // indirect github.com/elastic/go-elasticsearch/v6 v6.8.10 github.com/elazarl/go-bindata-assetfs v1.0.1 - github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c // indirect github.com/go-kit/kit v0.10.0 github.com/go-redis/redis/v7 v7.4.0 github.com/go-sql-driver/mysql v1.6.0 github.com/gogo/protobuf v1.3.2 - github.com/gomodule/redigo v1.8.8 + github.com/gomodule/redigo v2.0.0+incompatible github.com/google/uuid v1.2.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/hashicorp/golang-lru v0.5.4 + github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6 github.com/lib/pq v1.10.2 github.com/mattn/go-sqlite3 v1.14.7 github.com/mitchellh/mapstructure v1.4.3 - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect - github.com/onsi/ginkgo v1.12.0 // indirect github.com/opentracing/opentracing-go v1.2.0 github.com/pelletier/go-toml v1.9.2 - github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233 // indirect github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.11.0 github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 - github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0 // indirect - github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400 // indirect - github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d // indirect github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec github.com/stretchr/testify v1.7.0 - github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112 // indirect - github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83 // indirect - github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973 // indirect go.etcd.io/etcd/client/v3 v3.5.2 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a google.golang.org/grpc v1.38.0 google.golang.org/protobuf v1.26.0 - gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect - gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) + +replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.8 diff --git a/go.sum b/go.sum index ac0416ff..5690ef99 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,6 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pO github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.8.8 h1:f6cXq6RRfiyrOJEV7p3JhLDlmawGBVBBP1MggY8Mo4E= github.com/gomodule/redigo v1.8.8/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE= -github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= -github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=