Upgrade go licenses to 1.5.0 (#495)
Use new features, including allowed license checking
diff --git a/Makefile b/Makefile
index 089461b..76bdb75 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@
KUSTOMIZE_VERSION=v4.5.2
CONTROLLER_GEN_VERSION=v0.6.0
-GO_LICENSES_VERSION=v1.0.0
+GO_LICENSES_VERSION=v1.5.0
GINKGO_VERSION = $(shell cat go.mod | grep 'github.com/onsi/ginkgo' | sed 's/.*\(v.*\)$$/\1/g')
GO111MODULE ?= on
@@ -115,10 +115,10 @@
go fmt ./...
fetch-licenses-list: go-licenses ## Fetch the list of license types
- $(GO_LICENSES) csv . | grep -v -E "solr-operator" | sort > dependency_licenses.csv
+ $(GO_LICENSES) report . --ignore github.com/apache/solr-operator | sort > dependency_licenses.csv
fetch-licenses-full: go-licenses ## Fetch all licenses
- $(GO_LICENSES) save . --save_path licenses --force
+ $(GO_LICENSES) save . --ignore github.com/apache/solr-operator --save_path licenses --force
build-release-artifacts: clean prepare docker-build ## Build all release artifacts for the Solr Operator
./hack/release/artifacts/create_artifacts.sh -d $(or $(ARTIFACTS_DIR),release-artifacts) -v $(VERSION)
@@ -187,7 +187,9 @@
@echo "Check license headers on necessary files"
./hack/check_license.sh
@echo "Check list of dependency licenses"
- $(GO_LICENSES) csv . 2>/dev/null | grep -v -E "solr-operator" | sort | diff dependency_licenses.csv -
+ $(GO_LICENSES) check . \
+ --allowed_licenses=Apache-2.0,Apache-1.1,MIT,BSD-3-Clause,BSD-2-Clause,ISC,ICU,X11,NCSA,W3C,AFL-3.0,MS-PL,CC0-1.0,BSL-1.0,WTFPL,Unicode-DFS-2015,Unicode-DFS-2016,ZPL-2.0,UPL-1.0,Unlicense,MPL-2.0
+ $(GO_LICENSES) report . --ignore github.com/apache/solr-operator 2>/dev/null | diff dependency_licenses.csv -
check-zk-op-version: ## Ensure the zookeeper-operator version is standard throughout the codebase
./hack/zk-operator/check-version.sh
diff --git a/dependency_licenses.csv b/dependency_licenses.csv
index abe6050..d0267a8 100644
--- a/dependency_licenses.csv
+++ b/dependency_licenses.csv
@@ -1,62 +1,62 @@
-cloud.google.com/go/compute/metadata,Unknown,Apache-2.0
-github.com/Azure/go-autorest/autorest,https://github.com/Azure/go-autorest/blob/master/autorest/LICENSE,Apache-2.0
-github.com/Azure/go-autorest/autorest/adal,https://github.com/Azure/go-autorest/blob/master/autorest/adal/LICENSE,Apache-2.0
-github.com/Azure/go-autorest/autorest/date,https://github.com/Azure/go-autorest/blob/master/autorest/date/LICENSE,Apache-2.0
-github.com/Azure/go-autorest/logger,https://github.com/Azure/go-autorest/blob/master/logger/LICENSE,Apache-2.0
-github.com/Azure/go-autorest/tracing,https://github.com/Azure/go-autorest/blob/master/tracing/LICENSE,Apache-2.0
-github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/master/quantile/LICENSE,MIT
-github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/master/v2/LICENSE.txt,MIT
-github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/master/spew/LICENSE,ISC
-github.com/docker/spdystream,https://github.com/docker/spdystream/blob/master/LICENSE,Apache-2.0
-github.com/evanphx/json-patch,https://github.com/evanphx/json-patch/blob/master/LICENSE,BSD-3-Clause
-github.com/form3tech-oss/jwt-go,https://github.com/form3tech-oss/jwt-go/blob/master/LICENSE,MIT
-github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/master/LICENSE,BSD-3-Clause
-github.com/go-logr/logr,https://github.com/go-logr/logr/blob/master/LICENSE,Apache-2.0
-github.com/go-logr/zapr,https://github.com/go-logr/zapr/blob/master/LICENSE,Apache-2.0
-github.com/gogo/protobuf,https://github.com/gogo/protobuf/blob/master/LICENSE,BSD-3-Clause
-github.com/golang/groupcache/lru,https://github.com/golang/groupcache/blob/master/lru/LICENSE,Apache-2.0
-github.com/golang/protobuf,https://github.com/golang/protobuf/blob/master/LICENSE,BSD-3-Clause
-github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/master/cmp/LICENSE,BSD-3-Clause
-github.com/google/gofuzz,https://github.com/google/gofuzz/blob/master/LICENSE,Apache-2.0
-github.com/google/uuid,https://github.com/google/uuid/blob/master/LICENSE,BSD-3-Clause
-github.com/googleapis/gnostic,https://github.com/googleapis/gnostic/blob/master/LICENSE,Apache-2.0
-github.com/hashicorp/golang-lru,https://github.com/hashicorp/golang-lru/blob/master/LICENSE,MPL-2.0
-github.com/imdario/mergo,https://github.com/imdario/mergo/blob/master/LICENSE,BSD-3-Clause
-github.com/json-iterator/go,https://github.com/json-iterator/go/blob/master/LICENSE,MIT
-github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/master/pbutil/LICENSE,Apache-2.0
-github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/master/LICENSE,Apache-2.0
-github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/master/LICENSE,Apache-2.0
-github.com/pkg/errors,https://github.com/pkg/errors/blob/master/LICENSE,BSD-2-Clause
-github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/master/prometheus/LICENSE,Apache-2.0
-github.com/prometheus/client_model/go,https://github.com/prometheus/client_model/blob/master/go/LICENSE,Apache-2.0
-github.com/prometheus/common,https://github.com/prometheus/common/blob/master/LICENSE,Apache-2.0
-github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,https://github.com/prometheus/common/blob/master/internal/bitbucket.org/ww/goautoneg/README.txt,BSD-3-Clause
-github.com/prometheus/procfs,https://github.com/prometheus/procfs/blob/master/LICENSE,Apache-2.0
-github.com/robfig/cron/v3,https://github.com/robfig/cron/blob/master/v3/LICENSE,MIT
-github.com/spf13/pflag,https://github.com/spf13/pflag/blob/master/LICENSE,BSD-3-Clause
-go.uber.org/atomic,Unknown,MIT
-go.uber.org/multierr,Unknown,MIT
-go.uber.org/zap,Unknown,MIT
-golang.org/x/crypto,Unknown,BSD-3-Clause
-golang.org/x/net,Unknown,BSD-3-Clause
-golang.org/x/oauth2,Unknown,BSD-3-Clause
-golang.org/x/sys,Unknown,BSD-3-Clause
-golang.org/x/term,Unknown,BSD-3-Clause
-golang.org/x/text,Unknown,BSD-3-Clause
-golang.org/x/time/rate,Unknown,BSD-3-Clause
-gomodules.xyz/jsonpatch/v2,Unknown,Apache-2.0
-google.golang.org/protobuf,Unknown,BSD-3-Clause
-gopkg.in/inf.v0,Unknown,BSD-3-Clause
-gopkg.in/yaml.v2,Unknown,Apache-2.0
-gopkg.in/yaml.v3,Unknown,MIT
-k8s.io/api,Unknown,Apache-2.0
-k8s.io/apiextensions-apiserver/pkg/apis/apiextensions,Unknown,Apache-2.0
-k8s.io/apimachinery,Unknown,Apache-2.0
-k8s.io/client-go,Unknown,Apache-2.0
-k8s.io/component-base/config,Unknown,Apache-2.0
-k8s.io/klog/v2,Unknown,Apache-2.0
-k8s.io/kube-openapi/pkg/util/proto,Unknown,Apache-2.0
-k8s.io/utils,Unknown,Apache-2.0
-sigs.k8s.io/controller-runtime,Unknown,Apache-2.0
-sigs.k8s.io/structured-merge-diff/v4/value,Unknown,Apache-2.0
-sigs.k8s.io/yaml,Unknown,MIT
+cloud.google.com/go/compute/metadata,https://github.com/googleapis/google-cloud-go/blob/v0.54.0/LICENSE,Apache-2.0
+github.com/Azure/go-autorest/autorest,https://github.com/Azure/go-autorest/blob/autorest/v0.11.1/autorest/LICENSE,Apache-2.0
+github.com/Azure/go-autorest/autorest/adal,https://github.com/Azure/go-autorest/blob/autorest/adal/v0.9.5/autorest/adal/LICENSE,Apache-2.0
+github.com/Azure/go-autorest/autorest/date,https://github.com/Azure/go-autorest/blob/autorest/date/v0.3.0/autorest/date/LICENSE,Apache-2.0
+github.com/Azure/go-autorest/logger,https://github.com/Azure/go-autorest/blob/logger/v0.2.0/logger/LICENSE,Apache-2.0
+github.com/Azure/go-autorest/tracing,https://github.com/Azure/go-autorest/blob/tracing/v0.6.0/tracing/LICENSE,Apache-2.0
+github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LICENSE,MIT
+github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.1.1/LICENSE.txt,MIT
+github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/v1.1.1/LICENSE,ISC
+github.com/docker/spdystream,https://github.com/docker/spdystream/blob/449fdfce4d96/LICENSE,Apache-2.0
+github.com/evanphx/json-patch,https://github.com/evanphx/json-patch/blob/v4.9.0/LICENSE,BSD-3-Clause
+github.com/form3tech-oss/jwt-go,https://github.com/form3tech-oss/jwt-go/blob/v3.2.2/LICENSE,MIT
+github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.4.9/LICENSE,BSD-3-Clause
+github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v0.3.0/LICENSE,Apache-2.0
+github.com/go-logr/zapr,https://github.com/go-logr/zapr/blob/v0.2.0/LICENSE,Apache-2.0
+github.com/gogo/protobuf,https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE,BSD-3-Clause
+github.com/golang/groupcache/lru,https://github.com/golang/groupcache/blob/8c9f03a8e57e/LICENSE,Apache-2.0
+github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.2/LICENSE,BSD-3-Clause
+github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.5.5/LICENSE,BSD-3-Clause
+github.com/google/gofuzz,https://github.com/google/gofuzz/blob/v1.1.0/LICENSE,Apache-2.0
+github.com/google/uuid,https://github.com/google/uuid/blob/v1.1.2/LICENSE,BSD-3-Clause
+github.com/googleapis/gnostic,https://github.com/googleapis/gnostic/blob/v0.5.1/LICENSE,Apache-2.0
+github.com/hashicorp/golang-lru,https://github.com/hashicorp/golang-lru/blob/v0.5.4/LICENSE,MPL-2.0
+github.com/imdario/mergo,https://github.com/imdario/mergo/blob/v0.3.10/LICENSE,BSD-3-Clause
+github.com/json-iterator/go,https://github.com/json-iterator/go/blob/v1.1.10/LICENSE,MIT
+github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/c182affec369/LICENSE,Apache-2.0
+github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0
+github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.1/LICENSE,Apache-2.0
+github.com/pkg/errors,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause
+github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.7.1/LICENSE,Apache-2.0
+github.com/prometheus/client_model/go,https://github.com/prometheus/client_model/blob/v0.2.0/LICENSE,Apache-2.0
+github.com/prometheus/common,https://github.com/prometheus/common/blob/v0.10.0/LICENSE,Apache-2.0
+github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,https://github.com/prometheus/common/blob/v0.10.0/internal/bitbucket.org/ww/goautoneg/README.txt,BSD-3-Clause
+github.com/prometheus/procfs,https://github.com/prometheus/procfs/blob/v0.2.0/LICENSE,Apache-2.0
+github.com/robfig/cron/v3,https://github.com/robfig/cron/blob/v3.0.1/LICENSE,MIT
+github.com/spf13/pflag,https://github.com/spf13/pflag/blob/v1.0.5/LICENSE,BSD-3-Clause
+go.uber.org/atomic,https://github.com/uber-go/atomic/blob/v1.6.0/LICENSE.txt,MIT
+go.uber.org/multierr,https://github.com/uber-go/multierr/blob/v1.5.0/LICENSE.txt,MIT
+go.uber.org/zap,https://github.com/uber-go/zap/blob/v1.15.0/LICENSE.txt,MIT
+golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/8b5274cf:LICENSE,BSD-3-Clause
+golang.org/x/net,https://cs.opensource.google/go/x/net/+/89ef3d95:LICENSE,BSD-3-Clause
+golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/bf48bf16:LICENSE,BSD-3-Clause
+golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/04245dca:LICENSE,BSD-3-Clause
+golang.org/x/term,https://cs.opensource.google/go/x/term/+/7de9c90e:LICENSE,BSD-3-Clause
+golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.3.7:LICENSE,BSD-3-Clause
+golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/3af7569d:LICENSE,BSD-3-Clause
+gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.1.0/v2/LICENSE,Apache-2.0
+google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.26.0/LICENSE,BSD-3-Clause
+gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause
+gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0
+gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/eeeca48fe776/LICENSE,MIT
+k8s.io/api,https://github.com/kubernetes/api/blob/v0.20.2/LICENSE,Apache-2.0
+k8s.io/apiextensions-apiserver/pkg/apis/apiextensions,https://github.com/kubernetes/apiextensions-apiserver/blob/v0.20.1/LICENSE,Apache-2.0
+k8s.io/apimachinery,https://github.com/kubernetes/apimachinery/blob/v0.20.2/LICENSE,Apache-2.0
+k8s.io/client-go,https://github.com/kubernetes/client-go/blob/v0.20.2/LICENSE,Apache-2.0
+k8s.io/component-base/config,https://github.com/kubernetes/component-base/blob/v0.20.2/LICENSE,Apache-2.0
+k8s.io/klog/v2,https://github.com/kubernetes/klog/blob/v2.4.0/LICENSE,Apache-2.0
+k8s.io/kube-openapi/pkg/util/proto,https://github.com/kubernetes/kube-openapi/blob/d219536bb9fd/LICENSE,Apache-2.0
+k8s.io/utils,https://github.com/kubernetes/utils/blob/fddb29f9d009/LICENSE,Apache-2.0
+sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.8.3/LICENSE,Apache-2.0
+sigs.k8s.io/structured-merge-diff/v4/value,https://github.com/kubernetes-sigs/structured-merge-diff/blob/v4.0.2/LICENSE,Apache-2.0
+sigs.k8s.io/yaml,https://github.com/kubernetes-sigs/yaml/blob/v1.2.0/LICENSE,MIT
