From 1c5c8219f2a4d62a01133bd598ecd6e04f5fc2c7 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 26 Jan 2018 14:30:37 -0800 Subject: [PATCH] Gopkg.*: remove directive dependencies from Gopkg.toml Reproducible builds are already done via Gopkg.lock. Remove "constraint"s for external projects with conflicting dependencies. Signed-off-by: Gyuho Lee --- Gopkg.lock | 33 +----------- Gopkg.toml | 155 +---------------------------------------------------- 2 files changed, 2 insertions(+), 186 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 615dbee67..4ce1760a5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,21 +11,18 @@ name = "github.com/bgentry/speakeasy" packages = ["."] revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd" - source = "https://github.com/bgentry/speakeasy" version = "v0.1.0" [[projects]] name = "github.com/coreos/bbolt" packages = ["."] revision = "48ea1b39c25fc1bab3506fbc712ecbaa842c4d2d" - source = "https://github.com/coreos/bbolt" version = "v1.3.1-coreos.6" [[projects]] name = "github.com/coreos/go-semver" packages = ["semver"] revision = "8ab6407b697782a06568d4b7f1db25550ec2e4c6" - source = "https://github.com/coreos/go-semver" version = "v0.2.0" [[projects]] @@ -36,7 +33,6 @@ "util" ] revision = "d2196463941895ee908e13531a23a39feb9e1243" - source = "https://github.com/coreos/go-systemd" version = "v15" [[projects]] @@ -46,7 +42,6 @@ "dlopen" ] revision = "3ac0863d7acf3bc44daf49afef8919af12f704ef" - source = "https://github.com/coreos/pkg" version = "v3" [[projects]] @@ -59,20 +54,17 @@ name = "github.com/dgrijalva/jwt-go" packages = ["."] revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c" - source = "https://github.com/dgrijalva/jwt-go" version = "v3.0.0" [[projects]] name = "github.com/dustin/go-humanize" packages = ["."] revision = "bb3d318650d48840a39aa21a027c6630e198e626" - source = "https://github.com/dustin/go-humanize" [[projects]] name = "github.com/ghodss/yaml" packages = ["."] revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" - source = "https://github.com/ghodss/yaml" version = "v1.0.0" [[projects]] @@ -83,14 +75,12 @@ "protoc-gen-gogo/descriptor" ] revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02" - source = "https://github.com/gogo/protobuf" version = "v0.5" [[projects]] name = "github.com/golang/groupcache" packages = ["lru"] revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433" - source = "https://github.com/golang/groupcache" [[projects]] name = "github.com/golang/protobuf" @@ -104,13 +94,11 @@ "ptypes/timestamp" ] revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" - source = "https://github.com/golang/protobuf" [[projects]] name = "github.com/google/btree" packages = ["."] revision = "925471ac9e2131377a91e1595defec898166fe49" - source = "https://github.com/google/btree" [[projects]] name = "github.com/gorilla/websocket" @@ -122,7 +110,6 @@ name = "github.com/grpc-ecosystem/go-grpc-prometheus" packages = ["."] revision = "0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7" - source = "https://github.com/grpc-ecosystem/go-grpc-prometheus" [[projects]] name = "github.com/grpc-ecosystem/grpc-gateway" @@ -132,7 +119,6 @@ "utilities" ] revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec" - source = "https://github.com/grpc-ecosystem/grpc-gateway" version = "v1.3.1" [[projects]] @@ -145,14 +131,12 @@ name = "github.com/jonboulle/clockwork" packages = ["."] revision = "2eee05ed794112d45db504eb05aa693efd2b8b09" - source = "https://github.com/jonboulle/clockwork" version = "v0.1.0" [[projects]] name = "github.com/kr/pty" packages = ["."] revision = "2c10821df3c3cf905230d078702dfbe9404c9b23" - source = "https://github.com/kr/pty" version = "v1.0.0" [[projects]] @@ -172,7 +156,6 @@ name = "github.com/olekukonko/tablewriter" packages = ["."] revision = "a0225b3f23b5ce0cbec6d7a66a968f8a59eca9c4" - source = "https://github.com/olekukonko/tablewriter" [[projects]] branch = "master" @@ -187,13 +170,11 @@ "prometheus/promhttp" ] revision = "5cec1d0429b02e4323e042eb04dafdb079ddf568" - source = "https://github.com/prometheus/client_golang" [[projects]] name = "github.com/prometheus/client_model" packages = ["go"] revision = "6f3806018612930941127f2a7c6c453ba2c527d2" - source = "https://github.com/prometheus/client_model" [[projects]] name = "github.com/prometheus/common" @@ -231,46 +212,39 @@ name = "github.com/soheilhy/cmux" packages = ["."] revision = "bb79a83465015a27a175925ebd155e660f55e9f1" - source = "https://github.com/soheilhy/cmux" version = "v0.1.3" [[projects]] name = "github.com/spf13/cobra" packages = ["."] revision = "1c44ec8d3f1552cac48999f9306da23c4d8a288b" - source = "https://github.com/spf13/cobra" [[projects]] name = "github.com/spf13/pflag" packages = ["."] revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" - source = "https://github.com/spf13/pflag" version = "v1.0.0" [[projects]] name = "github.com/tmc/grpc-websocket-proxy" packages = ["wsproxy"] revision = "89b8d40f7ca833297db804fcb3be53a76d01c238" - source = "https://github.com/tmc/grpc-websocket-proxy" [[projects]] name = "github.com/ugorji/go" packages = ["codec"] revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57" - source = "https://github.com/ugorji/go" [[projects]] name = "github.com/urfave/cli" packages = ["."] revision = "1efa31f08b9333f1bd4882d61f9d668a70cd902e" - source = "https://github.com/urfave/cli" version = "v1.18.0" [[projects]] name = "github.com/xiang90/probing" packages = ["."] revision = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2" - source = "https://github.com/xiang90/probing" version = "0.0.1" [[projects]] @@ -281,7 +255,6 @@ "ssh/terminal" ] revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3" - source = "https://github.com/golang/crypto" [[projects]] name = "golang.org/x/net" @@ -295,7 +268,6 @@ "trace" ] revision = "66aacef3dd8a676686c7ae3716979581e8b03c47" - source = "https://github.com/golang/net" [[projects]] name = "golang.org/x/sys" @@ -326,7 +298,6 @@ name = "golang.org/x/time" packages = ["rate"] revision = "c06e80d9300e4443158a03817b8a8cb37d230320" - source = "https://github.com/golang/time" [[projects]] name = "google.golang.org/genproto" @@ -358,14 +329,12 @@ "transport" ] revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e" - source = "https://github.com/grpc/grpc-go" version = "v1.7.5" [[projects]] name = "gopkg.in/cheggaaa/pb.v1" packages = ["."] revision = "226d21d43a305fac52b3a104ef83e721b15275e0" - source = "https://github.com/cheggaaa/pb" version = "v1.0.2" [[projects]] @@ -377,6 +346,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "d3d9cf93e8be79ee71de7d96f1b7529d51fbdf1a96cc0b865fc8ec6b1a42c575" + inputs-digest = "96fbefc6136356d14bdf753a4a6ccf6279d81c55eba28c5f5bdb915d075fc171" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 03a31bb75..620b13a14 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,160 +1,7 @@ ################################ # Direct dependencies -[[constraint]] - name = "github.com/coreos/bbolt" - source = "https://github.com/coreos/bbolt" - version = "=v1.3.1-coreos.6" - -[[constraint]] - name = "github.com/google/btree" - source = "https://github.com/google/btree" - revision = "925471ac9e2131377a91e1595defec898166fe49" - -[[constraint]] - name = "google.golang.org/grpc" - source = "https://github.com/grpc/grpc-go" - version = "=v1.7.5" - -[[constraint]] - name = "github.com/grpc-ecosystem/grpc-gateway" - source = "https://github.com/grpc-ecosystem/grpc-gateway" - version = "=v1.3.1" - -[[constraint]] - name = "github.com/tmc/grpc-websocket-proxy" - source = "https://github.com/tmc/grpc-websocket-proxy" - revision = "89b8d40f7ca833297db804fcb3be53a76d01c238" - -[[constraint]] - name = "github.com/grpc-ecosystem/go-grpc-prometheus" - source = "https://github.com/grpc-ecosystem/go-grpc-prometheus" - revision = "0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7" - -[[constraint]] - name = "github.com/gogo/protobuf" - source = "https://github.com/gogo/protobuf" - version = "=v0.5" - -[[constraint]] - name = "github.com/golang/protobuf" - source = "https://github.com/golang/protobuf" - revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" - -[[constraint]] - name = "github.com/soheilhy/cmux" - source = "https://github.com/soheilhy/cmux" - version = "=v0.1.3" - -[[constraint]] - name = "github.com/golang/groupcache" - source = "https://github.com/golang/groupcache" - revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433" - -[[constraint]] - name = "golang.org/x/time" - source = "https://github.com/golang/time" - revision = "c06e80d9300e4443158a03817b8a8cb37d230320" - -[[constraint]] - name = "golang.org/x/net" - source = "https://github.com/golang/net" - revision = "66aacef3dd8a676686c7ae3716979581e8b03c47" - -[[constraint]] - name = "golang.org/x/crypto" - source = "https://github.com/golang/crypto" - revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3" - -[[constraint]] - name = "github.com/coreos/go-systemd" - source = "https://github.com/coreos/go-systemd" - version = "=v15" - -[[constraint]] - name = "github.com/coreos/go-semver" - source = "https://github.com/coreos/go-semver" - version = "=v0.2.0" - -[[constraint]] - name = "github.com/coreos/pkg" - source = "https://github.com/coreos/pkg" - version = "=v3" - -[[constraint]] - name = "github.com/spf13/cobra" - source = "https://github.com/spf13/cobra" - revision = "1c44ec8d3f1552cac48999f9306da23c4d8a288b" - -[[constraint]] - name = "github.com/spf13/pflag" - source = "https://github.com/spf13/pflag" - version = "=v1.0.0" - -[[constraint]] - name = "github.com/urfave/cli" - source = "https://github.com/urfave/cli" - version = "=v1.18.0" - -[[constraint]] - name = "github.com/ugorji/go" - source = "https://github.com/ugorji/go" - revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57" - -[[constraint]] - name = "github.com/kr/pty" - source = "https://github.com/kr/pty" - version = "=v1.0.0" - -[[constraint]] - name = "github.com/bgentry/speakeasy" - source = "https://github.com/bgentry/speakeasy" - version = "=v0.1.0" - -[[constraint]] - name = "github.com/dustin/go-humanize" - source = "https://github.com/dustin/go-humanize" - revision = "bb3d318650d48840a39aa21a027c6630e198e626" - -[[constraint]] - name = "github.com/olekukonko/tablewriter" - source = "https://github.com/olekukonko/tablewriter" - revision = "a0225b3f23b5ce0cbec6d7a66a968f8a59eca9c4" - -[[constraint]] - name = "gopkg.in/cheggaaa/pb.v1" - source = "https://github.com/cheggaaa/pb" - version = "=v1.0.2" - -[[constraint]] - name = "github.com/ghodss/yaml" - source = "https://github.com/ghodss/yaml" - version = "=v1.0.0" - -[[constraint]] - name = "github.com/jonboulle/clockwork" - source = "https://github.com/jonboulle/clockwork" - version = "=v0.1.0" - -[[constraint]] - name = "github.com/xiang90/probing" - source = "https://github.com/xiang90/probing" - version = "=0.0.1" - -[[constraint]] - name = "github.com/dgrijalva/jwt-go" - source = "https://github.com/dgrijalva/jwt-go" - version = "=v3.0.0" - -[[constraint]] - name = "github.com/prometheus/client_golang" - source = "https://github.com/prometheus/client_golang" - revision = "5cec1d0429b02e4323e042eb04dafdb079ddf568" - -[[constraint]] - name = "github.com/prometheus/client_model" - source = "https://github.com/prometheus/client_model" - revision = "6f3806018612930941127f2a7c6c453ba2c527d2" +# See "Gopkg.lock" ################################