From f69159362a44a179bfd3716110e3bb90e45cd345 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie <jimmy.zelinskie+git@gmail.com> Date: Sat, 23 Dec 2017 17:16:20 -0500 Subject: [PATCH] vendor: migrate from glide to dep --- Gopkg.lock | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Gopkg.toml | 58 +++++++++++++++++++++++ glide.lock | 73 ----------------------------- glide.yaml | 24 ---------- 4 files changed, 193 insertions(+), 97 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..1865dc5 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,135 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/SermoDigital/jose" + packages = [".","crypto","jws","jwt"] + revision = "f6df55f235c24f236d11dbcf665249a59ac2021f" + version = "1.1" + +[[projects]] + branch = "master" + name = "github.com/beorn7/perks" + packages = ["quantile"] + revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9" + +[[projects]] + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "346938d642f2ec3594ed81d874461961cd0faa76" + version = "v1.1.0" + +[[projects]] + branch = "master" + name = "github.com/golang/protobuf" + packages = ["proto"] + revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" + +[[projects]] + name = "github.com/inconshreveable/mousetrap" + packages = ["."] + revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + version = "v1.0" + +[[projects]] + name = "github.com/julienschmidt/httprouter" + packages = ["."] + revision = "8c199fb6259ffc1af525cc3ad52ee60ba8359669" + version = "v1.1" + +[[projects]] + name = "github.com/matttproud/golang_protobuf_extensions" + packages = ["pbutil"] + revision = "3247c84500bff8d9fb6d579d800f20b3e091582c" + version = "v1.0.0" + +[[projects]] + branch = "master" + name = "github.com/mendsley/gojwk" + packages = ["."] + revision = "4d5ec6e58103388d6cb0d7d72bc72649be4f0504" + +[[projects]] + branch = "master" + name = "github.com/minio/sha256-simd" + packages = ["."] + revision = "ad98a36ba0da87206e3378c556abbfeaeaa98668" + +[[projects]] + name = "github.com/pmezard/go-difflib" + packages = ["difflib"] + revision = "792786c7400a136282c1664665ae0a8db921c6c2" + version = "v1.0.0" + +[[projects]] + name = "github.com/prometheus/client_golang" + packages = ["prometheus"] + revision = "c5b7fccd204277076155f10851dad72b76a49317" + version = "v0.8.0" + +[[projects]] + branch = "master" + name = "github.com/prometheus/client_model" + packages = ["go"] + revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" + +[[projects]] + branch = "master" + name = "github.com/prometheus/common" + packages = ["expfmt","internal/bitbucket.org/ww/goautoneg","model"] + revision = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca" + +[[projects]] + branch = "master" + name = "github.com/prometheus/procfs" + packages = [".","xfs"] + revision = "8f918ac9ab4be3a790338bda8624fec5d71260b3" + +[[projects]] + name = "github.com/sirupsen/logrus" + packages = ["."] + revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba" + version = "v1.0.4" + +[[projects]] + name = "github.com/spf13/cobra" + packages = ["."] + revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" + version = "v0.0.1" + +[[projects]] + name = "github.com/spf13/pflag" + packages = ["."] + revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" + version = "v1.0.0" + +[[projects]] + name = "github.com/stretchr/testify" + packages = ["assert","require"] + revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" + version = "v1.1.4" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + revision = "d585fd2cc9195196078f516b69daff6744ef5e84" + +[[projects]] + branch = "master" + name = "golang.org/x/sys" + packages = ["unix","windows"] + revision = "83801418e1b59fb1880e363299581ee543af32ca" + +[[projects]] + branch = "v2" + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "f73a01a852753ecab441d7901cbf324cdfbdbadf174e60fe0d162278f355ea21" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..717790d --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,58 @@ + +# 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/SermoDigital/jose" + version = "1.1.0" + +[[constraint]] + name = "github.com/julienschmidt/httprouter" + version = "1.1.0" + +[[constraint]] + branch = "master" + name = "github.com/mendsley/gojwk" + +[[constraint]] + branch = "master" + name = "github.com/minio/sha256-simd" + +[[constraint]] + name = "github.com/prometheus/client_golang" + version = "0.8.0" + +[[constraint]] + name = "github.com/sirupsen/logrus" + version = "1.0.4" + +[[constraint]] + name = "github.com/spf13/cobra" + version = "0.0.1" + +[[constraint]] + name = "github.com/stretchr/testify" + version = "1.1.4" + +[[constraint]] + branch = "v2" + name = "gopkg.in/yaml.v2" diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 30d2b84..0000000 --- a/glide.lock +++ /dev/null @@ -1,73 +0,0 @@ -hash: afe26469a328ec99dd3c4b8cc86d407ad72f65d9053ae9c3bec6d447d34d8189 -updated: 2017-07-03T18:55:10.538458698-04:00 -imports: -- name: github.com/beorn7/perks - version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 - subpackages: - - quantile -- name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 - subpackages: - - spew -- name: github.com/golang/protobuf - version: 6a1fa9404c0aebf36c879bc50152edcc953910d2 - subpackages: - - proto -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/julienschmidt/httprouter - version: 8c199fb6259ffc1af525cc3ad52ee60ba8359669 -- name: github.com/matttproud/golang_protobuf_extensions - version: c12348ce28de40eed0136aa2b644d0ee0650e56c - subpackages: - - pbutil -- name: github.com/mendsley/gojwk - version: 4d5ec6e58103388d6cb0d7d72bc72649be4f0504 -- name: github.com/minio/sha256-simd - version: f3ec2e4d36d43c3a899ed4b7d9f62188edcf5afd -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib -- name: github.com/prometheus/client_golang - version: c5b7fccd204277076155f10851dad72b76a49317 - subpackages: - - prometheus -- name: github.com/prometheus/client_model - version: 6f3806018612930941127f2a7c6c453ba2c527d2 - subpackages: - - go -- name: github.com/prometheus/common - version: 0866df4b85a18d652b6965be022d007cdf076822 - subpackages: - - expfmt - - internal/bitbucket.org/ww/goautoneg - - model -- name: github.com/prometheus/procfs - version: e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2 - subpackages: - - xfs -- name: github.com/SermoDigital/jose - version: f6df55f235c24f236d11dbcf665249a59ac2021f - subpackages: - - crypto - - jws - - jwt -- name: github.com/sirupsen/logrus - version: 202f25545ea4cf9b191ff7f846df5d87c9382c2b -- name: github.com/spf13/cobra - version: 8c6fa02d2225de0f9bdcb7ca912556f68d172d8c -- name: github.com/spf13/pflag - version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 -- name: github.com/stretchr/testify - version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 - subpackages: - - assert - - require -- name: golang.org/x/sys - version: 94b76065f2d2081d0fef24a6e67c571f51a6408a - subpackages: - - unix -- name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 01221e2..0000000 --- a/glide.yaml +++ /dev/null @@ -1,24 +0,0 @@ -package: github.com/chihaya/chihaya -import: -- package: github.com/SermoDigital/jose - version: ~1.1.0 - subpackages: - - crypto - - jws - - jwt -- package: github.com/sirupsen/logrus - version: ~1.0.0 -- package: github.com/julienschmidt/httprouter - version: ~1.1.0 -- package: github.com/mendsley/gojwk -- package: github.com/minio/sha256-simd -- package: github.com/prometheus/client_golang - version: ~0.8.0 - subpackages: - - prometheus -- package: github.com/spf13/cobra -- package: github.com/stretchr/testify - version: ~1.1.4 - subpackages: - - require -- package: gopkg.in/yaml.v2