From b701fb68b0733670ba63c6475e82eabcff531d5f Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Wed, 8 Nov 2017 13:30:02 -0600 Subject: [PATCH] Remove unneeded Gopkg.toml constraints and update all dependencies. Fixes #926. --- Gopkg.lock | 42 ++++++++++++++++++++++-------------------- Gopkg.toml | 52 +++------------------------------------------------- 2 files changed, 25 insertions(+), 69 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 09793a7e2..ed772ef39 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -4,7 +4,8 @@ [[projects]] name = "github.com/BurntSushi/toml" packages = ["."] - revision = "99064174e013895bbd9b025c31100bd1d9b590ca" + revision = "b26d9c308763d68093482582cea63d69be07a0f0" + version = "v0.3.0" [[projects]] branch = "master" @@ -27,7 +28,8 @@ [[projects]] name = "github.com/boltdb/bolt" packages = ["."] - revision = "4b1ebc1869ad66568b313d0dc410e2be72670dda" + revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8" + version = "v1.3.1" [[projects]] name = "github.com/davecgh/go-spew" @@ -51,13 +53,13 @@ branch = "master" name = "github.com/golang/groupcache" packages = ["lru"] - revision = "b710c8433bd175204919eb38776e944233235d03" + revision = "84a468cf14b4376def5d68c722b139b881c450a4" [[projects]] branch = "master" name = "github.com/golang/protobuf" packages = ["proto"] - revision = "130e6b02ab059e7b717a096f397c5b60111cae74" + revision = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9" [[projects]] name = "github.com/gorilla/context" @@ -68,8 +70,8 @@ [[projects]] name = "github.com/gorilla/mux" packages = ["."] - revision = "24fca303ac6da784b9e8269f724ddeb0b2eea5e7" - version = "v1.5.0" + revision = "7f08801859139f86dfafd1c296e2cba9a80d292e" + version = "v1.6.0" [[projects]] branch = "master" @@ -99,7 +101,7 @@ branch = "master" name = "github.com/hashicorp/go-sockaddr" packages = ["."] - revision = "41949a141473f6340abc6ba0fcd0f89da6f6f837" + revision = "9b4c5fa5b10a683339a270d664474b9f4aee62fc" [[projects]] branch = "master" @@ -111,7 +113,7 @@ branch = "master" name = "github.com/hashicorp/hcl" packages = [".","hcl/ast","hcl/parser","hcl/scanner","hcl/strconv","hcl/token","json/parser","json/scanner","json/token"] - revision = "68e816d1c783414e79bc65b3994d9ab6b0a722ab" + revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" [[projects]] name = "github.com/hashicorp/memberlist" @@ -135,13 +137,13 @@ branch = "master" name = "github.com/miekg/dns" packages = [".","internal/socket"] - revision = "946bd9fbed05568b0f3cd188353d8aa28f38b688" + revision = "9fc4eb252eedf0ef8adc05169ce35da5e31beaba" [[projects]] branch = "master" name = "github.com/mitchellh/mapstructure" packages = ["."] - revision = "d0303fe809921458f417bcf828397a65db30a7e4" + revision = "06020f85339e21b2478f756a78e295255ffa4d6a" [[projects]] name = "github.com/pelletier/go-toml" @@ -171,7 +173,7 @@ branch = "master" name = "github.com/spf13/afero" packages = [".","mem"] - revision = "e67d870304c4bca21331b02f414f970df13aa694" + revision = "5660eeed305fe5f69c8fc6cf899132a459a97064" [[projects]] name = "github.com/spf13/cast" @@ -180,10 +182,10 @@ version = "v1.1.0" [[projects]] - branch = "master" name = "github.com/spf13/cobra" packages = ["."] - revision = "50204810fdb5010baae72e4f41b303689cbdcc9f" + revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" + version = "v0.0.1" [[projects]] branch = "master" @@ -198,34 +200,34 @@ version = "v1.0.0" [[projects]] - branch = "master" name = "github.com/spf13/viper" packages = ["."] - revision = "d9cca5ef33035202efb1586825bdbb15ff9ec3ba" + revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" + version = "v1.0.0" [[projects]] branch = "master" name = "golang.org/x/net" packages = ["context"] - revision = "a04bdaca5b32abe1c069418fb7088ae607de5bd0" + revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2" [[projects]] branch = "master" name = "golang.org/x/sync" packages = ["errgroup"] - revision = "8e0aa688b654ef28caa72506fa5ec8dba9fc7690" + revision = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5" [[projects]] branch = "master" name = "golang.org/x/sys" packages = ["unix"] - revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082" + revision = "1e2299c37cc91a509f1b12369872d27be0ce98a6" [[projects]] branch = "master" name = "golang.org/x/text" packages = ["internal/gen","internal/triegen","internal/ucd","transform","unicode/cldr","unicode/norm"] - revision = "825fc78a2fd6fa0a5447e300189e3219e05e1f25" + revision = "88f656faf3f37f690df1a32515b479415e1a6769" [[projects]] branch = "v2" @@ -236,6 +238,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "0a7eaef315413bc55acf42c5566982fb71be8c11f33162127953572738967b35" + inputs-digest = "75badb0bcc3bb356b04af17979e0af61b4b66c5e0a483f09e39cf1f9b5e5de2c" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index a91539345..7ffa67a2f 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,49 +1,3 @@ - -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - -[[constraint]] - name = "github.com/BurntSushi/toml" - revision = "99064174e013895bbd9b025c31100bd1d9b590ca" - -[[constraint]] - branch = "master" - name = "github.com/CAFxX/gcnotifier" - -[[constraint]] - name = "github.com/boltdb/bolt" - version = "1.3.0" - -[[constraint]] - name = "github.com/gorilla/mux" - version = "1.3.0" - -[[constraint]] - name = "github.com/hashicorp/memberlist" - version = "=0.1.0" - -[[constraint]] - branch = "master" - name = "github.com/spf13/cobra" - -[[constraint]] - branch = "master" - name = "github.com/spf13/viper" +# This file intentionally left blank as all needed dependencies are imported by +# the project and thus tracked by `dep`. +# See https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md for details.