diff --git a/Gopkg.lock b/Gopkg.lock index ad1abb5..04168e0 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -50,6 +50,12 @@ revision = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52" version = "v0.3.2" +[[projects]] + branch = "master" + name = "github.com/globalsign/mgo" + packages = [".","bson","internal/json","internal/sasl","internal/scram"] + revision = "896bbb89d21253a28cd5a7f8b81fe091410cb94d" + [[projects]] name = "github.com/go-ldap/ldap" packages = ["."] @@ -116,12 +122,6 @@ revision = "379148ca0225df7a432012b8df0355c2a2063ac0" version = "v1.2" -[[projects]] - branch = "v2" - name = "gopkg.in/mgo.v2" - packages = [".","bson","internal/json","internal/sasl","internal/scram"] - revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655" - [[projects]] branch = "v2" name = "gopkg.in/yaml.v2" @@ -131,6 +131,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "9e82a1ccbfaf6d829a674b5a0bbf05663612d9ea9f443534f3153bd37b7128fa" + inputs-digest = "2e2023629c134da8099f44e6d2719a5bc407d2b350e75f6f79a35ade95859ebd" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index b6937ba..acd3a21 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -34,8 +34,8 @@ required = ["github.com/docker/distribution"] version = "0.8.0" [[constraint]] - branch = "v2" - name = "gopkg.in/mgo.v2" + branch = "master" + name = "github.com/globalsign/mgo" [[constraint]] branch = "v2" diff --git a/dao/mongo/event.go b/dao/mongo/event.go index 7198026..860dda9 100644 --- a/dao/mongo/event.go +++ b/dao/mongo/event.go @@ -2,7 +2,7 @@ package mongo import ( "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo/bson" ) func (d *Dao) EventList(args *model.EventListArgs) (events []*model.Event, count int, err error) { diff --git a/dao/mongo/mongo.go b/dao/mongo/mongo.go index 73a86be..364d0ee 100644 --- a/dao/mongo/mongo.go +++ b/dao/mongo/mongo.go @@ -2,11 +2,10 @@ package mongo import ( "errors" - "time" "github.com/cuigh/auxo/log" - "gopkg.in/mgo.v2" + "github.com/globalsign/mgo" ) var ( diff --git a/dao/mongo/perm.go b/dao/mongo/perm.go index b96bc88..174a94f 100644 --- a/dao/mongo/perm.go +++ b/dao/mongo/perm.go @@ -2,8 +2,8 @@ package mongo import ( "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) func (d *Dao) PermGet(resType, resID string) (p *model.Perm, err error) { diff --git a/dao/mongo/registry.go b/dao/mongo/registry.go index 1ebe97f..4a5c2db 100644 --- a/dao/mongo/registry.go +++ b/dao/mongo/registry.go @@ -4,8 +4,8 @@ import ( "time" "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) func (d *Dao) RegistryCreate(registry *model.Registry) (err error) { diff --git a/dao/mongo/role.go b/dao/mongo/role.go index 4c3cf4e..ab28cc5 100644 --- a/dao/mongo/role.go +++ b/dao/mongo/role.go @@ -2,8 +2,8 @@ package mongo import ( "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) func (d *Dao) RoleList() (roles []*model.Role, err error) { diff --git a/dao/mongo/setting.go b/dao/mongo/setting.go index 0a7a691..498ed3f 100644 --- a/dao/mongo/setting.go +++ b/dao/mongo/setting.go @@ -2,8 +2,8 @@ package mongo import ( "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) const settingID int32 = 0 diff --git a/dao/mongo/stack.go b/dao/mongo/stack.go index a7d2d87..84e0708 100644 --- a/dao/mongo/stack.go +++ b/dao/mongo/stack.go @@ -5,8 +5,8 @@ import ( "github.com/cuigh/swirl/misc" "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) func (d *Dao) ArchiveList(args *model.ArchiveListArgs) (archives []*model.Archive, count int, err error) { diff --git a/dao/mongo/template.go b/dao/mongo/template.go index 27bb2c6..48cd40c 100644 --- a/dao/mongo/template.go +++ b/dao/mongo/template.go @@ -4,8 +4,8 @@ import ( "time" "github.com/cuigh/swirl/model" - mgo "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) func (d *Dao) TemplateList(args *model.TemplateListArgs) (tpls []*model.Template, count int, err error) { diff --git a/dao/mongo/user.go b/dao/mongo/user.go index 5de402d..ac01d75 100644 --- a/dao/mongo/user.go +++ b/dao/mongo/user.go @@ -4,8 +4,8 @@ import ( "time" "github.com/cuigh/swirl/model" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" + "github.com/globalsign/mgo" + "github.com/globalsign/mgo/bson" ) func (d *Dao) UserCount() (count int, err error) {