From 3dc74539bf3495f95a333683829465838a92c9f6 Mon Sep 17 00:00:00 2001
From: elfgoh <elfgoh@yahoo.com>
Date: Fri, 14 Apr 2017 14:06:37 +0800
Subject: [PATCH] Fixing #420 where lock and manifest have moved to TOML (#421)

https://github.com/golang/dep/pull/342
---
 Gopkg.lock    | 222 +++++++++++++++++++++++++++++++
 Gopkg.toml    |  28 ++++
 lock.json     | 351 --------------------------------------------------
 manifest.json |  25 ----
 4 files changed, 250 insertions(+), 376 deletions(-)
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml
 delete mode 100644 lock.json
 delete mode 100644 manifest.json

diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000000..9ff41a5e41
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,222 @@
+memo = "404d058cf6b46d820e153afc5721e1ab2aa2b10ec345d969b9c460097f99add3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/Azure/azure-storage-go"
+  packages = ["."]
+  revision = "12ccaadb081cdd217702067d28da9a7ff4305239"
+
+[[projects]]
+  name = "github.com/Azure/go-autorest"
+  packages = ["autorest","autorest/azure","autorest/date"]
+  revision = "a2fdd780c9a50455cecd249b00bdc3eb73a78e31"
+  version = "v7.3.1"
+
+[[projects]]
+  name = "github.com/BurntSushi/toml"
+  packages = ["."]
+  revision = "b26d9c308763d68093482582cea63d69be07a0f0"
+  version = "v0.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/Sirupsen/logrus"
+  packages = ["."]
+  revision = "10f801ebc38b33738c9d17d50860f484a0988ff5"
+
+[[projects]]
+  name = "github.com/asaskevich/govalidator"
+  packages = ["."]
+  revision = "7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877"
+  version = "v5"
+
+[[projects]]
+  name = "github.com/aws/aws-sdk-go"
+  packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/request","aws/session","aws/signer/v4","private/endpoints","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restxml","private/protocol/xml/xmlutil","private/waiter","service/s3","service/sts"]
+  revision = "5b341290c488aa6bd76b335d819b4a68516ec3ab"
+
+[[projects]]
+  name = "github.com/boltdb/bolt"
+  packages = ["."]
+  revision = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"
+  version = "v1.3.0"
+
+[[projects]]
+  name = "github.com/cenkalti/backoff"
+  packages = ["."]
+  revision = "32cd0c5b3aef12c76ed64aaf678f6c79736be7dc"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/cheggaaa/pb"
+  packages = ["."]
+  revision = "b6229822fa186496fcbf34111237e7a9693c6971"
+  version = "v1.0.13"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+  version = "v3.0.0"
+
+[[projects]]
+  name = "github.com/go-ini/ini"
+  packages = ["."]
+  revision = "e7fea39b01aea8d5671f6858f0532f56e8bff3a5"
+  version = "v1.27.0"
+
+[[projects]]
+  name = "github.com/go-sql-driver/mysql"
+  packages = ["."]
+  revision = "a0583e0143b1624142adab07e0e97fe106d99561"
+  version = "v1.3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/google/subcommands"
+  packages = ["."]
+  revision = "ce3d4cfc062faac7115d44e5befec8b5a08c3faa"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gosuri/uitable"
+  packages = [".","util/strutil","util/wordwrap"]
+  revision = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/howeyc/gopass"
+  packages = ["."]
+  revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+
+[[projects]]
+  name = "github.com/jinzhu/gorm"
+  packages = [".","dialects/mysql","dialects/sqlite"]
+  revision = "5174cc5c242a728b435ea2be8a2f7f998e15429b"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/jinzhu/inflection"
+  packages = ["."]
+  revision = "1c35d901db3da928c72a72d8458480cc9ade058f"
+
+[[projects]]
+  name = "github.com/jmespath/go-jmespath"
+  packages = ["."]
+  revision = "3433f3ea46d9f8019119e7dd41274e112a2359a9"
+  version = "0.2.2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/jroimartin/gocui"
+  packages = ["."]
+  revision = "612b0b2987ec1a6af46d7008cef1efd4b3898346"
+
+[[projects]]
+  name = "github.com/k0kubun/pp"
+  packages = ["."]
+  revision = "027a6d1765d673d337e687394dbe780dd64e2a1e"
+  version = "v2.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kotakanbe/go-cve-dictionary"
+  packages = ["config","db","jvn","log","models","nvd","util"]
+  revision = "8fb43afc719094af43ed782c567d30b58557ac78"
+
+[[projects]]
+  name = "github.com/kotakanbe/go-pingscanner"
+  packages = ["."]
+  revision = "641dc2cc2d3cbf295dad356667b74c69bcbd6f70"
+  version = "v0.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kotakanbe/logrus-prefixed-formatter"
+  packages = ["."]
+  revision = "e7519b8c80ba008a3bfc57ffa31232bf2a77f455"
+
+[[projects]]
+  name = "github.com/mattn/go-colorable"
+  packages = ["."]
+  revision = "d228849504861217f796da67fae4f6e347643f15"
+  version = "v0.0.7"
+
+[[projects]]
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  revision = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"
+  version = "v0.0.2"
+
+[[projects]]
+  name = "github.com/mattn/go-runewidth"
+  packages = ["."]
+  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
+  version = "v0.0.2"
+
+[[projects]]
+  name = "github.com/mattn/go-sqlite3"
+  packages = ["."]
+  revision = "ca5e3819723d8eeaf170ad510e7da1d6d2e94a08"
+  version = "v1.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mgutz/ansi"
+  packages = ["."]
+  revision = "9520e82c474b0a04dd04f8a40959027271bab992"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/moul/http2curl"
+  packages = ["."]
+  revision = "4e24498b31dba4683efb9d35c1c8a91e2eda28c8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/nsf/termbox-go"
+  packages = ["."]
+  revision = "7994c181db7761ca3c67a217068cf31826113f5f"
+
+[[projects]]
+  name = "github.com/parnurzeal/gorequest"
+  packages = ["."]
+  revision = "a578a48e8d6ca8b01a3b18314c43c6716bb5f5a3"
+  version = "v0.2.15"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/rifflock/lfshook"
+  packages = ["."]
+  revision = "2adb3e0c4ddd8778c4adde609d2dfd4fbe6096ea"
+  version = "1.6"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["curve25519","ed25519","ed25519/internal/edwards25519","ssh","ssh/agent","ssh/terminal"]
+  revision = "ed779e1bec0180cdfce8135ca6558067b388777b"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["context","idna","publicsuffix"]
+  revision = "d1e1b351919c6738fdeb9893d5c998b161464f0c"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix"]
+  revision = "f3918c30c5c2cb527c0b071a27c35120a6c0719a"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/text"
+  packages = ["internal/gen","internal/triegen","internal/ucd","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"]
+  revision = "f4b4367115ec2de254587813edaa901bc1c723a8"
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000000..b1a1ac2115
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,28 @@
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/Azure/azure-storage-go"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/BurntSushi/toml"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/Sirupsen/logrus"
+
+[[dependencies]]
+  name = "github.com/aws/aws-sdk-go"
+  revision = "5b341290c488aa6bd76b335d819b4a68516ec3ab"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/jroimartin/gocui"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/kotakanbe/go-cve-dictionary"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/kotakanbe/logrus-prefixed-formatter"
diff --git a/lock.json b/lock.json
deleted file mode 100644
index bee678e7d9..0000000000
--- a/lock.json
+++ /dev/null
@@ -1,351 +0,0 @@
-{
-    "memo": "404d058cf6b46d820e153afc5721e1ab2aa2b10ec345d969b9c460097f99add3",
-    "projects": [
-        {
-            "name": "github.com/Azure/azure-storage-go",
-            "branch": "master",
-            "revision": "12ccaadb081cdd217702067d28da9a7ff4305239",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/Azure/go-autorest",
-            "version": "v7.3.0",
-            "revision": "ec5f4903f77ed9927ac95b19ab8e44ada64c1356",
-            "packages": [
-                "autorest",
-                "autorest/azure",
-                "autorest/date"
-            ]
-        },
-        {
-            "name": "github.com/BurntSushi/toml",
-            "version": "v0.3.0",
-            "revision": "b26d9c308763d68093482582cea63d69be07a0f0",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/Sirupsen/logrus",
-            "branch": "master",
-            "revision": "10f801ebc38b33738c9d17d50860f484a0988ff5",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/asaskevich/govalidator",
-            "version": "v5",
-            "revision": "7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/aws/aws-sdk-go",
-            "revision": "5b341290c488aa6bd76b335d819b4a68516ec3ab",
-            "packages": [
-                "aws",
-                "aws/awserr",
-                "aws/awsutil",
-                "aws/client",
-                "aws/client/metadata",
-                "aws/corehandlers",
-                "aws/credentials",
-                "aws/credentials/ec2rolecreds",
-                "aws/credentials/endpointcreds",
-                "aws/credentials/stscreds",
-                "aws/defaults",
-                "aws/ec2metadata",
-                "aws/request",
-                "aws/session",
-                "aws/signer/v4",
-                "private/endpoints",
-                "private/protocol",
-                "private/protocol/query",
-                "private/protocol/query/queryutil",
-                "private/protocol/rest",
-                "private/protocol/restxml",
-                "private/protocol/xml/xmlutil",
-                "private/waiter",
-                "service/s3",
-                "service/sts"
-            ]
-        },
-        {
-            "name": "github.com/boltdb/bolt",
-            "version": "v1.3.0",
-            "revision": "583e8937c61f1af6513608ccc75c97b6abdf4ff9",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/cenkalti/backoff",
-            "version": "v1.0.0",
-            "revision": "32cd0c5b3aef12c76ed64aaf678f6c79736be7dc",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/cheggaaa/pb",
-            "version": "v1.0.11",
-            "revision": "0817e3a1f8de9e3c78b159699b3c07d53e24a963",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/dgrijalva/jwt-go",
-            "version": "v3.0.0",
-            "revision": "d2709f9f1f31ebcda9651b03077758c1f3a0018c",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/go-ini/ini",
-            "version": "v1.27.0",
-            "revision": "e7fea39b01aea8d5671f6858f0532f56e8bff3a5",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/go-sql-driver/mysql",
-            "version": "v1.3",
-            "revision": "a0583e0143b1624142adab07e0e97fe106d99561",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/google/subcommands",
-            "branch": "master",
-            "revision": "ce3d4cfc062faac7115d44e5befec8b5a08c3faa",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/gosuri/uitable",
-            "branch": "master",
-            "revision": "36ee7e946282a3fb1cfecd476ddc9b35d8847e42",
-            "packages": [
-                ".",
-                "util/strutil",
-                "util/wordwrap"
-            ]
-        },
-        {
-            "name": "github.com/howeyc/gopass",
-            "branch": "master",
-            "revision": "bf9dde6d0d2c004a008c27aaee91170c786f6db8",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/jinzhu/gorm",
-            "version": "v1.0",
-            "revision": "5174cc5c242a728b435ea2be8a2f7f998e15429b",
-            "packages": [
-                ".",
-                "dialects/mysql",
-                "dialects/sqlite"
-            ]
-        },
-        {
-            "name": "github.com/jinzhu/inflection",
-            "branch": "master",
-            "revision": "1c35d901db3da928c72a72d8458480cc9ade058f",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/jmespath/go-jmespath",
-            "version": "0.2.2",
-            "revision": "3433f3ea46d9f8019119e7dd41274e112a2359a9",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/jroimartin/gocui",
-            "branch": "master",
-            "revision": "612b0b2987ec1a6af46d7008cef1efd4b3898346",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/k0kubun/pp",
-            "version": "v2.3.0",
-            "revision": "027a6d1765d673d337e687394dbe780dd64e2a1e",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/kotakanbe/go-cve-dictionary",
-            "branch": "master",
-            "revision": "8fb43afc719094af43ed782c567d30b58557ac78",
-            "packages": [
-                "config",
-                "db",
-                "jvn",
-                "log",
-                "models",
-                "nvd",
-                "util"
-            ]
-        },
-        {
-            "name": "github.com/kotakanbe/go-pingscanner",
-            "version": "v0.1.0",
-            "revision": "641dc2cc2d3cbf295dad356667b74c69bcbd6f70",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/kotakanbe/logrus-prefixed-formatter",
-            "branch": "master",
-            "revision": "e7519b8c80ba008a3bfc57ffa31232bf2a77f455",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/mattn/go-colorable",
-            "version": "v0.0.7",
-            "revision": "d228849504861217f796da67fae4f6e347643f15",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/mattn/go-isatty",
-            "version": "v0.0.2",
-            "revision": "fc9e8d8ef48496124e79ae0df75490096eccf6fe",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/mattn/go-runewidth",
-            "version": "v0.0.2",
-            "revision": "9e777a8366cce605130a531d2cd6363d07ad7317",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/mattn/go-sqlite3",
-            "version": "v1.2.0",
-            "revision": "ca5e3819723d8eeaf170ad510e7da1d6d2e94a08",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/mgutz/ansi",
-            "branch": "master",
-            "revision": "9520e82c474b0a04dd04f8a40959027271bab992",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/moul/http2curl",
-            "branch": "master",
-            "revision": "4e24498b31dba4683efb9d35c1c8a91e2eda28c8",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/nsf/termbox-go",
-            "branch": "master",
-            "revision": "7994c181db7761ca3c67a217068cf31826113f5f",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/parnurzeal/gorequest",
-            "version": "v0.2.15",
-            "revision": "a578a48e8d6ca8b01a3b18314c43c6716bb5f5a3",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/pkg/errors",
-            "version": "v0.8.0",
-            "revision": "645ef00459ed84a119197bfb8d8205042c6df63d",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "github.com/rifflock/lfshook",
-            "version": "1.5",
-            "revision": "1ae91782cf87524466b000ea12d8291ea48269be",
-            "packages": [
-                "."
-            ]
-        },
-        {
-            "name": "golang.org/x/crypto",
-            "branch": "master",
-            "revision": "c2303dcbe84172e0c0da4c9f083eeca54c06f298",
-            "packages": [
-                "curve25519",
-                "ed25519",
-                "ed25519/internal/edwards25519",
-                "ssh",
-                "ssh/agent",
-                "ssh/terminal"
-            ]
-        },
-        {
-            "name": "golang.org/x/net",
-            "branch": "master",
-            "revision": "ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d",
-            "packages": [
-                "context",
-                "idna",
-                "publicsuffix"
-            ]
-        },
-        {
-            "name": "golang.org/x/sys",
-            "branch": "master",
-            "revision": "39e3dc274464e7d2f663aa606a830611bae5f1db",
-            "packages": [
-                "unix"
-            ]
-        },
-        {
-            "name": "golang.org/x/text",
-            "branch": "master",
-            "revision": "f4b4367115ec2de254587813edaa901bc1c723a8",
-            "packages": [
-                "internal/gen",
-                "internal/triegen",
-                "internal/ucd",
-                "secure/bidirule",
-                "transform",
-                "unicode/bidi",
-                "unicode/cldr",
-                "unicode/norm",
-                "unicode/rangetable"
-            ]
-        }
-    ]
-}
diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index ccd43472e3..0000000000
--- a/manifest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "dependencies": {
-        "github.com/Azure/azure-storage-go": {
-            "branch": "master"
-        },
-        "github.com/BurntSushi/toml": {
-            "branch": "master"
-        },
-        "github.com/Sirupsen/logrus": {
-            "branch": "master"
-        },
-        "github.com/aws/aws-sdk-go": {
-            "revision": "5b341290c488aa6bd76b335d819b4a68516ec3ab"
-        },
-        "github.com/jroimartin/gocui": {
-            "branch": "master"
-        },
-        "github.com/kotakanbe/go-cve-dictionary": {
-            "branch": "master"
-        },
-        "github.com/kotakanbe/logrus-prefixed-formatter": {
-            "branch": "master"
-        }
-    }
-}