From 14b89029c916024b37a2ac401695f0adb8e24844 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Mon, 3 Sep 2018 08:49:49 +0200 Subject: [PATCH] bill-of-materials: nuke Signed-off-by: Stephan Renatus --- Makefile | 6 +- bill-of-materials.json | 348 ----------------------------------------- glide.yaml | 10 +- 3 files changed, 4 insertions(+), 360 deletions(-) delete mode 100644 bill-of-materials.json diff --git a/Makefile b/Makefile index 1d7db02d..29947c9d 100644 --- a/Makefile +++ b/Makefile @@ -33,10 +33,9 @@ release-binary: @go build -o /go/bin/dex -v -ldflags $(LD_FLAGS) $(REPO_PATH)/cmd/dex .PHONY: revendor -revendor: bin/license-bill-of-materials +revendor: @glide up -v @glide-vc --use-lock-file --no-tests --only-code - @./bin/license-bill-of-materials ./cmd/dex ./cmd/example-app > bill-of-materials.json test: @go test -v -i $(shell go list ./... | grep -v '/vendor/') @@ -76,9 +75,6 @@ bin/protoc: scripts/get-protoc bin/protoc-gen-go: @go install -v $(REPO_PATH)/vendor/github.com/golang/protobuf/protoc-gen-go -bin/license-bill-of-materials: - @CGO_ENABLED=1 go install -v $(REPO_PATH)/vendor/github.com/coreos/license-bill-of-materials - .PHONY: check-go-version check-go-version: @./scripts/check-go-version diff --git a/bill-of-materials.json b/bill-of-materials.json deleted file mode 100644 index 1d1e52f1..00000000 --- a/bill-of-materials.json +++ /dev/null @@ -1,348 +0,0 @@ -[ - { - "project": "github.com/beevik/etree", - "licenses": [ - { - "type": "BSD 2-clause \"Simplified\" License", - "confidence": 0.9658536585365853 - } - ] - }, - { - "project": "github.com/beorn7/perks/quantile", - "licenses": [ - { - "type": "MIT License", - "confidence": 0.9891304347826086 - } - ] - }, - { - "project": "github.com/cockroachdb/cockroach-go/crdb", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 0.9988925802879292 - } - ] - }, - { - "project": "github.com/coreos/dex", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/coreos/etcd", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/coreos/go-oidc", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/felixge/httpsnoop", - "licenses": [ - { - "type": "MIT License", - "confidence": 0.9891304347826086 - } - ] - }, - { - "project": "github.com/ghodss/yaml", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.8357142857142857 - } - ] - }, - { - "project": "github.com/go-sql-driver/mysql", - "licenses": [ - { - "type": "Mozilla Public License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/golang/protobuf", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.92 - } - ] - }, - { - "project": "github.com/gorilla/handlers", - "licenses": [ - { - "type": "BSD 2-clause \"Simplified\" License", - "confidence": 0.9852216748768473 - } - ] - }, - { - "project": "github.com/gorilla/mux", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "github.com/grpc-ecosystem/go-grpc-prometheus", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/gtank/cryptopasta", - "licenses": [ - { - "type": "Creative Commons Zero v1.0 Universal", - "confidence": 0.9642857142857143 - } - ] - }, - { - "project": "github.com/jonboulle/clockwork", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/lib/pq", - "licenses": [ - { - "type": "MIT License", - "confidence": 0.9891304347826086 - } - ] - }, - { - "project": "github.com/mattn/go-sqlite3", - "licenses": [ - { - "type": "MIT License", - "confidence": 1 - } - ] - }, - { - "project": "github.com/matttproud/golang_protobuf_extensions/pbutil", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 0.9988925802879292 - } - ] - }, - { - "project": "github.com/pquerna/cachecontrol", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/prometheus/client_golang/prometheus", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/prometheus/client_model/go", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/prometheus/common", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/prometheus/procfs", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "github.com/russellhaering/goxmldsig", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 0.9573241061130334 - } - ] - }, - { - "project": "github.com/sirupsen/logrus", - "licenses": [ - { - "type": "MIT License", - "confidence": 1 - } - ] - }, - { - "project": "github.com/spf13/cobra", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 0.9573241061130334 - } - ] - }, - { - "project": "github.com/spf13/pflag", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "golang.org/x/crypto", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "golang.org/x/net", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "golang.org/x/oauth2", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "golang.org/x/text", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "google.golang.org/genproto/googleapis/rpc/status", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "google.golang.org/grpc", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.979253112033195 - } - ] - }, - { - "project": "gopkg.in/asn1-ber.v1", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "gopkg.in/ldap.v2", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "gopkg.in/square/go-jose.v2", - "licenses": [ - { - "type": "Apache License 2.0", - "confidence": 1 - } - ] - }, - { - "project": "gopkg.in/square/go-jose.v2/json", - "licenses": [ - { - "type": "BSD 3-clause \"New\" or \"Revised\" License", - "confidence": 0.9663865546218487 - } - ] - }, - { - "project": "gopkg.in/yaml.v2", - "licenses": [ - { - "type": "GNU Lesser General Public License v3.0", - "confidence": 0.9528301886792453 - }, - { - "type": "MIT License", - "confidence": 0.8975609756097561 - } - ] - } -] diff --git a/glide.yaml b/glide.yaml index 48769331..c08d7359 100644 --- a/glide.yaml +++ b/glide.yaml @@ -133,9 +133,9 @@ import: - proto - protoc-gen-go - protoc-gen-go/grpc - - protoc-gen-go/descriptor - - protoc-gen-go/plugin - - protoc-gen-go/generator + - protoc-gen-go/descriptor + - protoc-gen-go/plugin + - protoc-gen-go/generator - package: google.golang.org/genproto version: 411e09b969b1170a9f0c467558eb4c4c110d9c77 @@ -155,10 +155,6 @@ import: - package: github.com/jonboulle/clockwork version: bcac9884e7502bb2b474c0339d889cb981a2f27f -# License bill of materials generator. -- package: github.com/coreos/license-bill-of-materials - version: d70207c33a3c79a1c0479b208f8b7ab6215144c7 - # monitoring packages - package: github.com/beorn7/perks/quantile version: 3ac7bf7a47d159a033b107610db8a1b6575507a4