From f28784abb15b920a5d2e15bb6b665002be572515 Mon Sep 17 00:00:00 2001
From: Travis Jeffery <tj@travisjeffery.com>
Date: Sun, 29 Jul 2018 03:53:23 -0400
Subject: [PATCH] Revert "convert to go modules"

This reverts commit e81e67fcaef7fb990a398b33b4ac70f3e45732d8.
---
 Gopkg.lock | 379 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Gopkg.toml |  75 +++++++++++
 Makefile   |   6 +-
 go.mod     |  60 ---------
 4 files changed, 459 insertions(+), 61 deletions(-)
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml
 delete mode 100644 go.mod

diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 00000000..05d2cc57
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,379 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/Shopify/sarama"
+  packages = ["."]
+  revision = "bbdbe644099b7fdc8327d5cc69c030945188b2e9"
+  version = "v1.13.0"
+
+[[projects]]
+  name = "github.com/apache/thrift"
+  packages = ["lib/go/thrift"]
+  revision = "b2a4d4ae21c789b689dd162deb819665567f481c"
+  version = "0.10.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/armon/go-metrics"
+  packages = ["."]
+  revision = "9a4b6e10bed6220a1665955aa2b75afc91eb10b3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/beorn7/perks"
+  packages = ["quantile"]
+  revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+
+[[projects]]
+  name = "github.com/boltdb/bolt"
+  packages = ["."]
+  revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
+  version = "v1.3.1"
+
+[[projects]]
+  name = "github.com/bsm/sarama-cluster"
+  packages = ["."]
+  revision = "abf039439f66c1ce78017f560b490612552f6472"
+  version = "v2.1.10"
+
+[[projects]]
+  name = "github.com/cenkalti/backoff"
+  packages = ["."]
+  revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
+  version = "v2.0.0"
+
+[[projects]]
+  name = "github.com/cespare/xxhash"
+  packages = ["."]
+  revision = "5c37fe3735342a2e0d01c87a907579987c8936cc"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/codahale/hdrhistogram"
+  packages = ["."]
+  revision = "3a0bb77429bd3a61596f5e8a3172445844342120"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/eapache/go-resiliency"
+  packages = ["breaker"]
+  revision = "6800482f2c813e689c88b7ed3282262385011890"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/eapache/go-xerial-snappy"
+  packages = ["."]
+  revision = "bb955e01b9346ac19dc29eb16586c90ded99a98c"
+
+[[projects]]
+  name = "github.com/eapache/queue"
+  packages = ["."]
+  revision = "ded5959c0d4e360646dc9e9908cff48666781367"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "github.com/go-kit/kit"
+  packages = [
+    "metrics",
+    "metrics/internal/lv",
+    "metrics/prometheus"
+  ]
+  revision = "4dc7be5d2d12881735283bcab7352178e190fc71"
+  version = "v0.6.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/protobuf"
+  packages = ["proto"]
+  revision = "130e6b02ab059e7b717a096f397c5b60111cae74"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/snappy"
+  packages = ["."]
+  revision = "553a641470496b2327abcac10b36396bd98e45c9"
+
+[[projects]]
+  name = "github.com/hashicorp/consul"
+  packages = ["testutil/retry"]
+  revision = "48f3dd5642374d079f5a64359023fb8318eb81cc"
+  version = "v1.0.3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/errwrap"
+  packages = ["."]
+  revision = "7554cd9344cec97297fa6649b055a8c98c2a1e55"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-immutable-radix"
+  packages = ["."]
+  revision = "8aac2701530899b64bdea735a1de8da899815220"
+
+[[projects]]
+  name = "github.com/hashicorp/go-memdb"
+  packages = ["."]
+  revision = "75ff99613d288868d8888ec87594525906815dbc"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-msgpack"
+  packages = ["codec"]
+  revision = "fa3f63826f7c23912c15263591e65d54d080b458"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-multierror"
+  packages = ["."]
+  revision = "83588e72410abfbe4df460eeb6f30841ae47d4c4"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-sockaddr"
+  packages = ["."]
+  revision = "41949a141473f6340abc6ba0fcd0f89da6f6f837"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/golang-lru"
+  packages = ["simplelru"]
+  revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"
+
+[[projects]]
+  name = "github.com/hashicorp/memberlist"
+  packages = ["."]
+  revision = "ce8abaa0c60c2d6bee7219f5ddf500e0a1457b28"
+  version = "v0.1.0"
+
+[[projects]]
+  name = "github.com/hashicorp/raft"
+  packages = ["."]
+  revision = "6d14f0c70869faabd9e60ba7ed88a6cbbd6a661f"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/hashicorp/raft-boltdb"
+  packages = ["."]
+  revision = "a8adffd05b79e3d8b1817d46bbe387a112265b3e"
+
+[[projects]]
+  name = "github.com/hashicorp/serf"
+  packages = [
+    "coordinate",
+    "serf"
+  ]
+  revision = "911b3cc29e11db3e4c6ed4543c4c721e4e179752"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  packages = ["pbutil"]
+  revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/miekg/dns"
+  packages = [
+    ".",
+    "internal/socket"
+  ]
+  revision = "946bd9fbed05568b0f3cd188353d8aa28f38b688"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/go-testing-interface"
+  packages = ["."]
+  revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28"
+
+[[projects]]
+  name = "github.com/opentracing/opentracing-go"
+  packages = [
+    ".",
+    "ext",
+    "log"
+  ]
+  revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "github.com/pierrec/lz4"
+  packages = ["."]
+  revision = "08c27939df1bd95e881e2c2367a749964ad1fceb"
+  version = "v1.0.1"
+
+[[projects]]
+  name = "github.com/pierrec/xxHash"
+  packages = ["xxHash32"]
+  revision = "f051bb7f1d1aaf1b5a665d74fb6b0217712c69f7"
+  version = "v0.1.1"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[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 = "6f3806018612930941127f2a7c6c453ba2c527d2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/common"
+  packages = [
+    "expfmt",
+    "internal/bitbucket.org/ww/goautoneg",
+    "model"
+  ]
+  revision = "1bab55dd05dbff384524a6a1c99006d9eb5f139b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/procfs"
+  packages = [
+    ".",
+    "xfs"
+  ]
+  revision = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/rcrowley/go-metrics"
+  packages = ["."]
+  revision = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+  version = "v1.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/sean-/seed"
+  packages = ["."]
+  revision = "e2103e2c35297fb7e17febb81e49b312087a2372"
+
+[[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]]
+  name = "github.com/tj/go-gracefully"
+  packages = ["."]
+  revision = "005c1d102f1bf3158f9ba29c12d68a73ac15f321"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/travisjeffery/go-dynaport"
+  packages = ["."]
+  revision = "24009f4f2f49d394e2f7edeaa4b541f799d94792"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tysontate/gommap"
+  packages = ["."]
+  revision = "e87a6e482c2ceaa54bd76e0fb30d1f2d40dd3f01"
+
+[[projects]]
+  name = "github.com/uber/jaeger-client-go"
+  packages = [
+    ".",
+    "config",
+    "internal/baggage",
+    "internal/baggage/remote",
+    "internal/spanlog",
+    "log",
+    "rpcmetrics",
+    "thrift-gen/agent",
+    "thrift-gen/baggage",
+    "thrift-gen/jaeger",
+    "thrift-gen/sampling",
+    "thrift-gen/zipkincore",
+    "utils"
+  ]
+  revision = "3ac96c6e679cb60a74589b0d0aa7c70a906183f7"
+  version = "v2.11.2"
+
+[[projects]]
+  name = "github.com/uber/jaeger-lib"
+  packages = ["metrics"]
+  revision = "7f95f4f7e80028096410abddaae2556e4c61b59f"
+  version = "v1.3.1"
+
+[[projects]]
+  name = "github.com/ugorji/go"
+  packages = ["codec"]
+  revision = "9831f2c3ac1068a78f50999a30db84270f647af6"
+  version = "v1.1"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["context"]
+  revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix"]
+  revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082"
+
+[[projects]]
+  branch = "master"
+  name = "upspin.io"
+  packages = ["log"]
+  revision = "63f1073c7a3a0fe6162849630916771c15ed80e9"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "43239ec812464a19b77149436a116aed1a9ae438c8c982c84056077915f6f36e"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 00000000..a0607d62
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,75 @@
+
+# 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/Shopify/sarama"
+  version = "1.13.0"
+
+[[constraint]]
+  name = "github.com/gorilla/handlers"
+  version = "1.2.1"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "1.5.0"
+
+[[constraint]]
+  name = "github.com/hashicorp/raft"
+  version = "=1.0.0"
+
+[[constraint]]
+  revision = "a8adffd05b79e3d8b1817d46bbe387a112265b3e"
+  name = "github.com/hashicorp/raft-boltdb"
+
+[[constraint]]
+  name = "github.com/hashicorp/serf"
+  revision = "911b3cc29e11db3e4c6ed4543c4c721e4e179752"
+
+[[constraint]]
+  name = "github.com/hashicorp/go-memdb"
+  revision = "75ff99613d288868d8888ec87594525906815dbc"
+
+[[constraint]]
+  name = "github.com/uber/jaeger-client-go"
+  version = "=2.11.2"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "=0.8.0"
+
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  version = "=0.8.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[[constraint]]
+  name = "github.com/tj/go-gracefully"
+  revision = "005c1d102f1bf3158f9ba29c12d68a73ac15f321"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/tysontate/gommap"
+
diff --git a/Makefile b/Makefile
index 024c5797..4f53bf2f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,14 @@ DOCKER_TAG := latest
 
 all: test
 
+deps:
+	@which dep 2>/dev/null || go get -u github.com/golang/dep/cmd/dep
+	@dep ensure -v
+
 vet:
 	@go list ./... | grep -v vendor | xargs go vet
 
-build:
+build: deps
 	@go build -o $(BUILD_PATH) cmd/jocko/main.go
 
 release:
diff --git a/go.mod b/go.mod
deleted file mode 100644
index 66f8f4f4..00000000
--- a/go.mod
+++ /dev/null
@@ -1,60 +0,0 @@
-module github.com/travisjeffery/jocko
-
-require (
-	github.com/Shopify/sarama v1.13.0
-	github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
-	github.com/armon/go-metrics v0.0.0-20171002182731-9a4b6e10bed6
-	github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
-	github.com/boltdb/bolt v1.3.1
-	github.com/bsm/sarama-cluster v2.1.10+incompatible
-	github.com/cenkalti/backoff v2.0.0+incompatible
-	github.com/cespare/xxhash v1.0.0
-	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd
-	github.com/davecgh/go-spew v1.1.0
-	github.com/eapache/go-resiliency v1.0.0
-	github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934
-	github.com/eapache/queue v1.0.2
-	github.com/go-kit/kit v0.6.0
-	github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05
-	github.com/golang/snappy v0.0.0-20170215233205-553a64147049
-	github.com/hashicorp/consul v1.0.3
-	github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce
-	github.com/hashicorp/go-immutable-radix v0.0.0-20170725221215-8aac27015308
-	github.com/hashicorp/go-memdb v0.0.0-20171005030753-75ff99613d28
-	github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c
-	github.com/hashicorp/go-multierror v0.0.0-20170622060955-83588e72410a
-	github.com/hashicorp/go-sockaddr v0.0.0-20170627023441-41949a141473
-	github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad
-	github.com/hashicorp/memberlist v0.1.0
-	github.com/hashicorp/raft v1.0.0
-	github.com/hashicorp/raft-boltdb v0.0.0-20160913163600-a8adffd05b79
-	github.com/hashicorp/serf v0.0.0-20171222050535-911b3cc29e11
-	github.com/inconshreveable/mousetrap v1.0.0
-	github.com/matttproud/golang_protobuf_extensions v1.0.0
-	github.com/miekg/dns v0.0.0-20170930185408-946bd9fbed05
-	github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77
-	github.com/opentracing/opentracing-go v1.0.2
-	github.com/pierrec/lz4 v1.0.1
-	github.com/pierrec/xxHash v0.1.1
-	github.com/pkg/errors v0.8.0
-	github.com/pmezard/go-difflib v1.0.0
-	github.com/prometheus/client_golang v0.8.0
-	github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612
-	github.com/prometheus/common v0.0.0-20171006141418-1bab55dd05db
-	github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8
-	github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5
-	github.com/satori/go.uuid v1.2.0
-	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529
-	github.com/spf13/cobra v0.0.1
-	github.com/spf13/pflag v1.0.0
-	github.com/stretchr/testify v1.1.4
-	github.com/tj/go-gracefully v0.0.0-20141227061038-005c1d102f1b
-	github.com/travisjeffery/go-dynaport v0.0.0-20171203090423-24009f4f2f49
-	github.com/tysontate/gommap v0.0.0-20131202084435-e87a6e482c2c
-	github.com/uber/jaeger-client-go v2.11.2+incompatible
-	github.com/uber/jaeger-lib v1.3.1
-	github.com/ugorji/go v0.0.0-20180112141927-9831f2c3ac10
-	golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01
-	golang.org/x/sys v0.0.0-20171006175012-ebfc5b463182
-	upspin.io v0.0.0-20180517055408-63f1073c7a3a
-)