From e86a0c77f05997c606c497908edcb9ea709f2ce5 Mon Sep 17 00:00:00 2001 From: Tripon Alexandru-Ionut Date: Mon, 3 Jun 2019 14:39:35 +0300 Subject: [PATCH] Updated to go.mod --- .travis.yml | 7 ++- data/docker/devel/Dockerfile | 3 -- data/docker/devel/start.sh | 1 - data/docker/osips_training/Dockerfile | 4 -- docs/installation.rst | 15 +------ go.mod | 63 +++++++++++---------------- go.sum | 42 ++++++++++++++++++ packages/debian/rules | 2 - packages/redhat_fedora/cgrates.spec | 2 - packages/squeeze/rules | 0 test.sh | 2 +- 11 files changed, 73 insertions(+), 68 deletions(-) create mode 100755 packages/squeeze/rules diff --git a/.travis.yml b/.travis.yml index 0f68e34bf..4536ff4c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ language: go go: - - 1.11 + - 1.12.5 install: - - go get github.com/Masterminds/glide - - glide install -script: go test -v $(glide novendor) + +script: go test -v branches: only: master diff --git a/data/docker/devel/Dockerfile b/data/docker/devel/Dockerfile index fa965ecf2..040c585ea 100644 --- a/data/docker/devel/Dockerfile +++ b/data/docker/devel/Dockerfile @@ -28,9 +28,6 @@ RUN useradd -c CGRateS -d /var/run/cgrates -s /bin/false -r cgrates # install golang RUN wget -qO- https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz | tar xzf - -C /root/ -#install glide -RUN GOROOT=/root/go GOPATH=/root/code /root/go/bin/go get github.com/Masterminds/glide - #install oh-my-zsh RUN TERM=xterm sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"; exit 0 diff --git a/data/docker/devel/start.sh b/data/docker/devel/start.sh index 564ca7fe4..f5214b93f 100755 --- a/data/docker/devel/start.sh +++ b/data/docker/devel/start.sh @@ -28,7 +28,6 @@ export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$GOROOT/bin:$GOPAT # build and install cgrates cd /root/cgr -#glide -y devel.yaml install ./build.sh # create cgr-engine and cgr-loader link diff --git a/data/docker/osips_training/Dockerfile b/data/docker/osips_training/Dockerfile index 668ca070c..32d360191 100644 --- a/data/docker/osips_training/Dockerfile +++ b/data/docker/osips_training/Dockerfile @@ -13,8 +13,6 @@ RUN useradd -c CGRateS -d /var/run/cgrates -s /bin/false -r cgrates # install golang RUN wget -qO- https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz | tar xzf - -C /root/ -#install glide -RUN GOROOT=/root/go GOPATH=/root/code /root/go/bin/go get github.com/Masterminds/glide #install oh-my-zsh RUN TERM=xterm sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"; exit 0 @@ -31,8 +29,6 @@ RUN mkdir -p /root/code/src/github.com/cgrates; cd /root/code/src/github.com/cgr # create link to cgrates dir RUN ln -s /root/code/src/github.com/cgrates/cgrates /root/cgr -# get deps -RUN cd /root/cgr; GOROOT=/root/go GOPATH=/root/code PATH=$GOROOT/bin:$GOPATH/bin:$PATH glide install # build cgrates RUN cd /root/cgr; GOROOT=/root/go GOPATH=/root/code PATH=$GOROOT/bin:$GOPATH/bin:$PATH ./build.sh diff --git a/docs/installation.rst b/docs/installation.rst index 2ebc8541b..1b0aa8fc7 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -46,27 +46,14 @@ In this Tutorial we are going to install Go 1.11 3.2.2 Build CGRateS from Source ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To manage this *vendor* folder we use a tool named `glide`_ which will download specific versions of the external packages used by CGRateS. -To configure the project with `glide`_ use the following commands: +To configure the project with use the following commands: :: - go get github.com/Masterminds/glide go get github.com/cgrates/cgrates cd $GOPATH/src/github.com/cgrates/cgrates - glide install ./build.sh -The **glide install** command will install the external dependencies versions, specified in the **glide.lock** file, in the vendor folder. -There are different versions for each CGRateS branch, versions that are recorded in the **lock** file when the GCRateS releases are made (using **glide update** command). - -.. note:: The *vendor* folder **should not** be registered with the VCS we are using. - -For more information and command options use `glide`_ readme page. - -.. _installed: http://golang.org/doc/install -.. _configured: http://golang.org/doc/code.html -.. _glide: https://github.com/Masterminds/glide .. _post-install: diff --git a/go.mod b/go.mod index 0e95f5915..085139bc1 100644 --- a/go.mod +++ b/go.mod @@ -3,55 +3,44 @@ module github.com/cgrates/cgrates go 1.12 require ( - cloud.google.com/go v0.38.0 // indirect - contrib.go.opencensus.io/exporter/ocagent v0.5.0 // indirect - github.com/Azure/azure-sdk-for-go v28.1.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.1.0 // indirect - github.com/Azure/go-autorest/autorest/to v0.1.0 // indirect - github.com/Azure/go-autorest/autorest/validation v0.1.0 // indirect - github.com/antchfx/xmlquery v1.0.0 - github.com/antchfx/xpath v0.0.0-20190319080838-ce1d48779e67 // indirect - github.com/aws/aws-sdk-go v1.19.25 - github.com/cenk/hub v1.0.0 // indirect - github.com/cenkalti/hub v0.0.0-20160527103212-11382a9960d3 // indirect + github.com/antchfx/xmlquery v0.0.0-20180925013719-07935b1c0f2e + github.com/antchfx/xpath v0.0.0-20180922041825-3de91f3991a1 + github.com/aws/aws-sdk-go v0.0.0-20190204225153-38d16b00d959 + github.com/cenkalti/hub v0.0.0-20160527103212-11382a9960d3 github.com/cenkalti/rpc2 v0.0.0-20180727162946-9642ea02d0aa github.com/cgrates/aringo v0.0.0-20181115151919-f996da7890ea - github.com/cgrates/fsock v0.0.0-20190315103546-880b6b2d10e6 + github.com/cgrates/fsock v0.0.0-20180629100914-bcbd5e75c07d github.com/cgrates/go-diameter v0.0.0-20190305181340-74cc2c72ff0c github.com/cgrates/kamevapi v0.0.0-20180423120959-0e0d0379606f github.com/cgrates/ltcache v0.0.0-20181016092649-92fb7fa77cca + github.com/cgrates/osipsdagram v0.0.0-20150510101557-3d6beed66345 github.com/cgrates/radigo v0.0.0-20181207143118-e5c8f3272ccc github.com/cgrates/rpcclient v0.0.0-20190505150825-8fcc68b2c38b - github.com/fortytw2/leaktest v1.3.0 // indirect - github.com/fsnotify/fsnotify v1.4.7 - github.com/go-sql-driver/mysql v1.4.1 + github.com/dlintw/goconf v0.0.0-20120228082610-dcc070983490 + github.com/fsnotify/fsnotify v0.0.0-20180830220226-ccc981bf8038 + github.com/go-sql-driver/mysql v0.0.0-20180719071942-99ff426eb706 + github.com/go-stack/stack v1.8.0 // indirect github.com/golang/snappy v0.0.1 // indirect - github.com/google/go-cmp v0.3.0 // indirect github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 - github.com/hashicorp/golang-lru v0.5.1 // indirect - github.com/ishidawataru/sctp v0.0.0-20180918013207-6e2cb1366111 // indirect - github.com/jinzhu/gorm v1.9.7 - github.com/kr/pty v1.1.4 - github.com/lib/pq v1.1.1 - github.com/mattn/go-runewidth v0.0.4 // indirect - github.com/mediocregopher/radix.v2 v0.0.0-20181115013041-b67df6e626f9 - github.com/miekg/dns v1.1.9 - github.com/mitchellh/mapstructure v1.1.2 - github.com/mongodb/mongo-go-driver v0.2.0 + github.com/ishidawataru/sctp v0.0.0-20180918013207-6e2cb1366111 + github.com/jinzhu/gorm v0.0.0-20180914075349-5be9bd341358 + github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d + github.com/kr/pty v1.1.3 + github.com/lib/pq v1.0.0 + github.com/mattn/go-runewidth v0.0.3 + github.com/mediocregopher/radix.v2 v0.0.0-20180603022615-94360be26253 + github.com/miekg/dns v1.1.8 + github.com/mitchellh/mapstructure v1.0.0 + github.com/mongodb/mongo-go-driver v0.0.0-20190107203312-4f3b0a882e7d github.com/peterh/liner v1.1.0 - github.com/pkg/errors v0.8.1 // indirect - github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 - github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 // indirect - github.com/ugorji/go v1.1.4 + github.com/streadway/amqp v0.0.0-20180806233856-70e15c650864 + github.com/ugorji/go v0.0.0-20171112025056-5a66da2e74af github.com/vcabbage/amqp v0.11.0 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect github.com/xdg/stringprep v1.0.0 // indirect - golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284 // indirect - golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c + golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect - golang.org/x/sys v0.0.0-20190507053917-2953c62de483 // indirect - golang.org/x/text v0.3.2 // indirect - google.golang.org/appengine v1.5.0 // indirect - google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect - pack.ag/amqp v0.11.0 // indirect + golang.org/x/sys v0.0.0-20190412213103-97732733099d + golang.org/x/text v0.3.0 ) diff --git a/go.sum b/go.sum index a378cbfbf..dd97380f5 100644 --- a/go.sum +++ b/go.sum @@ -30,11 +30,17 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antchfx/xmlquery v0.0.0-20180925013719-07935b1c0f2e h1:0KotO9Ay0it1o6O+PzfHSke5+q1EWRlUo9MoPO1+J3I= +github.com/antchfx/xmlquery v0.0.0-20180925013719-07935b1c0f2e/go.mod h1:/+CnyD/DzHRnv2eRxrVbieRU/FIF6N0C+7oTtyUtCKk= github.com/antchfx/xmlquery v1.0.0 h1:YuEPqexGG2opZKNc9JU3Zw6zFXwC47wNcy6/F8oKsrM= github.com/antchfx/xmlquery v1.0.0/go.mod h1:/+CnyD/DzHRnv2eRxrVbieRU/FIF6N0C+7oTtyUtCKk= +github.com/antchfx/xpath v0.0.0-20180922041825-3de91f3991a1 h1:nt4RMjvM9pJ5HR7WkCeAnDz1pgHbLT2vxICalUTWcJU= +github.com/antchfx/xpath v0.0.0-20180922041825-3de91f3991a1/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= github.com/antchfx/xpath v0.0.0-20190319080838-ce1d48779e67 h1:uj4UuiIs53RhHSySIupR1TEIouckjSfnljF3QbN1yh0= github.com/antchfx/xpath v0.0.0-20190319080838-ce1d48779e67/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/aws/aws-sdk-go v0.0.0-20190204225153-38d16b00d959 h1:ime5SEOiWgOh8T92AvFIn19PvsaMLRZJgQAfjxUUAZg= +github.com/aws/aws-sdk-go v0.0.0-20190204225153-38d16b00d959/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.25 h1:8GCNTbGw/BnwH9LDxzqibltbJZCuro+1IohTFa58IDM= github.com/aws/aws-sdk-go v1.19.25/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -48,6 +54,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXG github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cgrates/aringo v0.0.0-20181115151919-f996da7890ea h1:KvikDlQoQdSWBc2E4hQRAVELCmAJCtOGq0LR3Swug2I= github.com/cgrates/aringo v0.0.0-20181115151919-f996da7890ea/go.mod h1:rGqp3Xbv+cXkzlJQ12SEz7a0wx5k7wVsVPAMFszuyCA= +github.com/cgrates/fsock v0.0.0-20180629100914-bcbd5e75c07d h1:AX1G32vkRSSW9JT8cLfxtnxhD59ZSFJO2pyXeFdBuqw= +github.com/cgrates/fsock v0.0.0-20180629100914-bcbd5e75c07d/go.mod h1:uWcTZ01eKJdWcoYBhsEXKgSlO6Vv8wT9qcR5JeJovBs= github.com/cgrates/fsock v0.0.0-20190315103546-880b6b2d10e6 h1:u0OD+oKymuHfEn8AsylxeFsgWJBHlbtJ9w8IkQn/WYM= github.com/cgrates/fsock v0.0.0-20190315103546-880b6b2d10e6/go.mod h1:uWcTZ01eKJdWcoYBhsEXKgSlO6Vv8wT9qcR5JeJovBs= github.com/cgrates/go-diameter v0.0.0-20190305181340-74cc2c72ff0c h1:S8WcAbUXOkIg31MDRujde8t8QOJym3z9MlSCqk1YZtw= @@ -56,6 +64,7 @@ github.com/cgrates/kamevapi v0.0.0-20180423120959-0e0d0379606f h1:TehMgY4+rV8MNb github.com/cgrates/kamevapi v0.0.0-20180423120959-0e0d0379606f/go.mod h1:pgHqPlPcEDIQbbs9wyBk7YZTcaVdxMqf3v04XU+mngI= github.com/cgrates/ltcache v0.0.0-20181016092649-92fb7fa77cca h1:Ejj4m0Ccl8dMMVnoHk4nQMlbR3w24llqQDy66DO9E0A= github.com/cgrates/ltcache v0.0.0-20181016092649-92fb7fa77cca/go.mod h1:q7c996DUu8OrJRnewVSQzM+y/bRcxZAHoo+zCD8bFBo= +github.com/cgrates/osipsdagram v0.0.0-20150510101557-3d6beed66345/go.mod h1:aUmncqoDInAi1/UrAI3yWLyuJc/zajuXqpkNqcAHCKs= github.com/cgrates/radigo v0.0.0-20181207143118-e5c8f3272ccc h1:vOvPAyI9pNhUM5k/Wc3mYvwmGpDrMg41BMkz4AW1wfg= github.com/cgrates/radigo v0.0.0-20181207143118-e5c8f3272ccc/go.mod h1:cMU/VXvC9YH2kXbhpgnkppYRjpqS8XgkKb8dI8HpU1I= github.com/cgrates/rpcclient v0.0.0-20190505150825-8fcc68b2c38b h1:GC+/hEDN/2Frh8Tjkf7u1XFxj0Z2XtwjBxj0OH6Mzhw= @@ -68,6 +77,7 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190423183735-731ef375ac02 h1:PS3xfVPa8 github.com/denisenkom/go-mssqldb v0.0.0-20190423183735-731ef375ac02/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dlintw/goconf v0.0.0-20120228082610-dcc070983490/go.mod h1:jWlUIP63OLr0cV2FGN2IEzSFsMAe58if8rk/SAE0JRE= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= @@ -75,11 +85,15 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DP github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/fsnotify/fsnotify v0.0.0-20180830220226-ccc981bf8038 h1:jgFKcRhiFGwZGMfydLMHtnpwvJM+7+bmGUVi1IXJ5zo= +github.com/fsnotify/fsnotify v0.0.0-20180830220226-ccc981bf8038/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-sql-driver/mysql v0.0.0-20180719071942-99ff426eb706 h1:P3NPKb7qq581SeMCB+dU1SuCX1kQh8VoQ/4HmT2ftQY= +github.com/go-sql-driver/mysql v0.0.0-20180719071942-99ff426eb706/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= @@ -117,8 +131,12 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ishidawataru/sctp v0.0.0-20180918013207-6e2cb1366111 h1:NAAiV9ass6VReWFjuxqrMIq12WKlSULI6Gs3PxQghLA= github.com/ishidawataru/sctp v0.0.0-20180918013207-6e2cb1366111/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8= +github.com/jinzhu/gorm v0.0.0-20180914075349-5be9bd341358 h1:nKFcPVmNVbVu9sPU1yMC/p6Zp3UcYeC29lhpdFrIIk8= +github.com/jinzhu/gorm v0.0.0-20180914075349-5be9bd341358/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo= github.com/jinzhu/gorm v1.9.7 h1:W8/F2N9x/tq3Vt+S4W12WjCVZB11tyerJ8RPKpQ8Xts= github.com/jinzhu/gorm v1.9.7/go.mod h1:bdqTT3q6dhSph2K3pWxrHP6nqxuAp2yQ3KFtc3U3F84= +github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d h1:jRQLvyVGL+iVtDElaEIDdKwpPqUIZJfzkNLV34htpEc= +github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a h1:eeaG9XMUvRBYXJi4pg1ZKM7nxc5AfXfojeLLW7O5J3k= github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.0 h1:6WV8LvwPpDhKjo5U9O6b4+xdG/jTXNPwlDme/MTo8Ns= @@ -133,10 +151,14 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.3 h1:/Um6a/ZmD5tF7peoOJ5oN5KMQ0DrGVQSXLNwyckutPk= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ= github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -147,12 +169,20 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mediocregopher/radix.v2 v0.0.0-20180603022615-94360be26253 h1:Vr5Q1i03Z36XuXdX1OQYUuJjnX7sYDLT3skT2VBgXrQ= +github.com/mediocregopher/radix.v2 v0.0.0-20180603022615-94360be26253/go.mod h1:fLRUbhbSd5Px2yKUaGYYPltlyxi1guJz1vCmo1RQL50= github.com/mediocregopher/radix.v2 v0.0.0-20181115013041-b67df6e626f9 h1:ViNuGS149jgnttqhc6XQNPwdupEMBXqCx9wtlW7P3sA= github.com/mediocregopher/radix.v2 v0.0.0-20181115013041-b67df6e626f9/go.mod h1:fLRUbhbSd5Px2yKUaGYYPltlyxi1guJz1vCmo1RQL50= +github.com/miekg/dns v1.1.8 h1:1QYRAKU3lN5cRfLCkPU08hwvLJFhvjP6MqNMmQz6ZVI= +github.com/miekg/dns v1.1.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E= github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= +github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mongodb/mongo-go-driver v0.0.0-20190107203312-4f3b0a882e7d h1:QMAA5d7ieW8llUT2tJHjvmj6WZbFtusqo4WsOlZVxvs= +github.com/mongodb/mongo-go-driver v0.0.0-20190107203312-4f3b0a882e7d/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU= github.com/mongodb/mongo-go-driver v0.2.0 h1:MBI/hnb0LiACJRVAlT+nL5wdtV4EFKTjJEhQdapZFB0= github.com/mongodb/mongo-go-driver v0.2.0/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -178,6 +208,8 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/streadway/amqp v0.0.0-20180806233856-70e15c650864 h1:Oj3PUEs+OUSYUpn35O+BE/ivHGirKixA3+vqA0Atu9A= +github.com/streadway/amqp v0.0.0-20180806233856-70e15c650864/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 h1:0ngsPmuP6XIjiFRNFYlvKwSr5zff2v+uPHaffZ6/M4k= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -187,6 +219,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 h1:rQ229MBgvW68s1/g6f1/63TgYwYxfF4E+bi/KC19P8g= github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/ugorji/go v0.0.0-20171112025056-5a66da2e74af h1:t75uFwPUcq1o8k4DCN3aDp6dNjSHLmp5mUc5E3PvD2k= +github.com/ugorji/go v0.0.0-20171112025056-5a66da2e74af/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/vcabbage/amqp v0.11.0 h1:sd7NPWvYsChCwfqpnLzLzYQMX3T6EqxKmzX9SRXjEec= @@ -204,6 +238,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284 h1:rlLehGeYg6jfoyz/eDqDU1iRXLKfR42nnNh57ytKEWo= golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc= +golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -212,6 +248,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3 h1:czFLhve3vsQetD6JOJ8NZZvGQIXlnN3/yXxbT6/awxI= +golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -230,6 +268,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3 h1:ZLExsLvnoqWSw6JB6k6RjWobIHGR3NG9dzVANJ7SVKc= +golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -241,6 +281,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507053917-2953c62de483 h1:0pONs62zZ8ED8kUnSCsv4RWjmwM6ideAalXGTybpo2s= golang.org/x/sys v0.0.0-20190507053917-2953c62de483/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20160901101418-ceefd2213ed2 h1:eUZxBUC7j2GB18BhEJjA+dmLvJ6DXAyNhKVpsWgUpvE= +golang.org/x/text v0.0.0-20160901101418-ceefd2213ed2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/packages/debian/rules b/packages/debian/rules index 43349cda3..2b513f427 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -24,8 +24,6 @@ binary-arch: clean dh_installdirs mkdir -p src/github.com/cgrates ln -sf $(CURDIR) src/github.com/cgrates - go get -v github.com/Masterminds/glide - $(GOPATH)/bin/glide install exec $(CURDIR)/build.sh mkdir -p $(PKGDIR)/usr/bin cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/ diff --git a/packages/redhat_fedora/cgrates.spec b/packages/redhat_fedora/cgrates.spec index e62b205ed..3785ae9c5 100644 --- a/packages/redhat_fedora/cgrates.spec +++ b/packages/redhat_fedora/cgrates.spec @@ -71,8 +71,6 @@ fi export GO15VENDOREXPERIMENT=1 export GOPATH=$RPM_BUILD_DIR/%{name}-%{version} cd $RPM_BUILD_DIR/%{name}-%{version}/src/github.com/cgrates/cgrates -go get -v github.com/Masterminds/glide -$GOPATH/bin/glide install ./build.sh %install diff --git a/packages/squeeze/rules b/packages/squeeze/rules new file mode 100755 index 000000000..e69de29bb diff --git a/test.sh b/test.sh index 8c6ab0558..6068b26d7 100755 --- a/test.sh +++ b/test.sh @@ -1,4 +1,4 @@ #! /usr/bin/env sh ./build.sh -go test $(glide novendor) +go test exit $?