server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unified gopkg.in/yaml version to v2 (#5169)

Browse Source 
* Unified gopkg.in/yaml version to v2 and go mod tidy

* update CHANGELOG
This commit is contained in:
Xuing 2023-03-09 15:19:01 +08:00 committed by GitHub
parent 9cf5b31d67
commit e4cd6b5722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,4 +1,5 @@
# developing
- [unified gopkg.in/yaml version to v2](https://github.com/beego/beego/pull/5169)
- [add non-block write log in asynchronous mode](https://github.com/beego/beego/pull/5150)
- [Fix 5126: support bloom filter cache](https://github.com/beego/beego/pull/5126)
- [Fix 5117: support write though cache](https://github.com/beego/beego/pull/5117)

2
client/httplib/httplib.go
View File

@ -48,7 +48,7 @@ import (
"strings"
"time"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
"github.com/beego/beego/v2/core/berror"
"github.com/beego/beego/v2/core/logs"

2
core/config/yaml/yaml.go
View File

@ -31,7 +31,7 @@ import (
"strings"
"sync"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
"github.com/beego/beego/v2/core/config"
"github.com/beego/beego/v2/core/logs"

3
go.mod
View File

@ -4,6 +4,7 @@ go 1.18
require (
github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542
github.com/bits-and-blooms/bloom/v3 v3.3.1
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/casbin/casbin v1.9.1
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58
@ -38,7 +39,6 @@ require (
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)
@ -46,7 +46,6 @@ require (
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.4.0 // indirect
github.com/bits-and-blooms/bloom/v3 v3.3.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect

1
go.sum
View File

@ -321,6 +321,7 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112 h1:NBrpnvz0pDPf3+HXZ1C9GcJd1DTpWDLcLWZhNq6uP7o=
github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg=
github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

2
server/web/context/output.go
View File

@ -32,7 +32,7 @@ import (
"time"
"google.golang.org/protobuf/proto"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)
// BeegoOutput does work for sending response header.