From 95a091f9362bdc6667083fe5e57f3760b35c8e97 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 17 Sep 2015 13:25:30 +0300 Subject: [PATCH] started using glide for vendor packages --- cmd/cgr-console/cgr-console.go | 2 +- engine/cdrs.go | 2 +- engine/storage_mysql.go | 2 +- engine/storage_postgres.go | 2 +- engine/storage_sql.go | 3 +-- glide.yaml | 19 +++++++++++++++++++ update_external_libs.sh | 18 ------------------ 7 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 glide.yaml delete mode 100755 update_external_libs.sh diff --git a/cmd/cgr-console/cgr-console.go b/cmd/cgr-console/cgr-console.go index 3aa480d1f..e7c672da5 100644 --- a/cmd/cgr-console/cgr-console.go +++ b/cmd/cgr-console/cgr-console.go @@ -29,8 +29,8 @@ import ( "github.com/cgrates/cgrates/console" "github.com/cgrates/cgrates/utils" - "github.com/cgrates/liner" "github.com/cgrates/rpcclient" + "github.com/peterh/liner" ) var ( diff --git a/engine/cdrs.go b/engine/cdrs.go index f3f6f3fe2..fb2469680 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -26,7 +26,7 @@ import ( "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" - "github.com/cgrates/gorm" + "github.com/jinzhu/gorm" ) var cdrServer *CdrServer // Share the server so we can use it in http handlers diff --git a/engine/storage_mysql.go b/engine/storage_mysql.go index 275552240..862aa2b59 100644 --- a/engine/storage_mysql.go +++ b/engine/storage_mysql.go @@ -25,7 +25,7 @@ import ( "time" "github.com/cgrates/cgrates/utils" - "github.com/cgrates/gorm" + "github.com/jinzhu/gorm" ) func NewMySQLStorage(host, port, name, user, password string, maxConn, maxIdleConn int) (Storage, error) { diff --git a/engine/storage_postgres.go b/engine/storage_postgres.go index 6fd38559c..c377b708c 100644 --- a/engine/storage_postgres.go +++ b/engine/storage_postgres.go @@ -26,7 +26,7 @@ import ( "github.com/cgrates/cgrates/utils" - "github.com/cgrates/gorm" + "github.com/jinzhu/gorm" _ "github.com/lib/pq" ) diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 9d7a673a8..511f4c039 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -30,8 +30,7 @@ import ( "github.com/cgrates/cgrates/utils" "github.com/go-sql-driver/mysql" - //"github.com/jinzhu/gorm" - "github.com/cgrates/gorm" + "github.com/jinzhu/gorm" ) type SQLStorage struct { diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 000000000..eab1ca64f --- /dev/null +++ b/glide.yaml @@ -0,0 +1,19 @@ +package: main +import: + - package: github.com/ugorji/go + - package: github.com/jinzhu/gorm + - package: golang.org/x/net + - package: github.com/DisposaBoy/JsonConfigReader + - package: github.com/hoisie/redis + - package: github.com/go-sql-driver/mysql + - package: github.com/gorhill/cronexpr + - package: github.com/lib/pq + - package: github.com/qor/inflection + - package: gopkg.in/mgo.v2 + - package: github.com/kr/pty + - package: gopkg.in/fsnotify.v1 + - package: github.com/peterh/liner + - package: github.com/cgrates/rpcclient + - package: github.com/cgrates/osipsdagram + - package: github.com/cgrates/kamevapi + - package: github.com/cgrates/fsock diff --git a/update_external_libs.sh b/update_external_libs.sh deleted file mode 100755 index 132e185ab..000000000 --- a/update_external_libs.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env sh -go get -v -u github.com/cgrates/fsock -go get -v -u github.com/cgrates/kamevapi -go get -v -u github.com/cgrates/osipsdagram -go get -u -v github.com/cgrates/liner -go get -u -v github.com/cgrates/rpcclient -go get -u -v github.com/cgrates/gorm - -go get -v -u github.com/lib/pq -go get -v -u github.com/ugorji/go/codec -go get -v -u gopkg.in/mgo.v2 -go get -u -v github.com/go-sql-driver/mysql -go get -u -v github.com/hoisie/redis -go get -u -v gopkg.in/fsnotify.v1 -go get -u -v github.com/gorhill/cronexpr -go get -u -v github.com/DisposaBoy/JsonConfigReader -go get -u -v golang.org/x/net/websocket -go get -u -v github.com/kr/pty