update licenses; add branch refs file to resolve seldon-core to master explicitly(default branch is v2); manually change the wrapt python package license type (#7048)

Author: vtaskow

executor/Makefile

@@ -140,7 +140,8 @@ licenses: licenses/dep.txt
 		-o licenses/repo.txt \
 		--manual-dep-repo-mapping ../licenses/dep_repo.manual.csv \
 		licenses/dep.txt
-	get-github-license-info -o licenses/license_info.csv licenses/repo.txt
+	get-github-license-info -o licenses/license_info.csv licenses/repo.txt \
+		--branch-refs ../licenses/branch_refs.manual.csv
 	python -m 'patch_additional_license_info' \
 		licenses/license_info.csv \
 		../licenses/additional_license_info.csv

executor/licenses/license.txt

@@ -32,11 +32,10 @@ armon/go-socks5,https://github.com/armon/go-socks5/blob/master/LICENSE,MIT Licen
 asaskevich/govalidator,https://github.com/asaskevich/govalidator/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/asaskevich/govalidator/master/LICENSE
 aws/aws-sdk-go,https://github.com/aws/aws-sdk-go/blob/main/LICENSE.txt,Apache License 2.0,https://raw.githubusercontent.com/aws/aws-sdk-go/main/LICENSE.txt
 banzaicloud/k8s-objectmatcher,https://github.com/banzaicloud/k8s-objectmatcher/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/banzaicloud/k8s-objectmatcher/master/LICENSE
-benbjohnson/clock,https://github.com/benbjohnson/clock/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/benbjohnson/clock/master/LICENSE
 beorn7/perks,https://github.com/beorn7/perks/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/beorn7/perks/master/LICENSE
 blang/semver,https://github.com/blang/semver/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/blang/semver/master/LICENSE
 blendle/zapdriver,https://github.com/blendle/zapdriver/blob/master/LICENSE,ISC License,https://raw.githubusercontent.com/blendle/zapdriver/master/LICENSE
-cenkalti/backoff,https://github.com/cenkalti/backoff/blob/v4/LICENSE,MIT License,https://raw.githubusercontent.com/cenkalti/backoff/v4/LICENSE
+cenkalti/backoff,https://github.com/cenkalti/backoff/blob/v5/LICENSE,MIT License,https://raw.githubusercontent.com/cenkalti/backoff/v5/LICENSE
 census-instrumentation/opencensus-proto,https://github.com/census-instrumentation/opencensus-proto/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/census-instrumentation/opencensus-proto/master/LICENSE
 cespare/xxhash,https://github.com/cespare/xxhash/blob/main/LICENSE.txt,MIT License,https://raw.githubusercontent.com/cespare/xxhash/main/LICENSE.txt
 client9/misspell,https://github.com/client9/misspell/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/client9/misspell/master/LICENSE
@@ -49,7 +48,7 @@ coreos/go-semver,https://github.com/coreos/go-semver/blob/main/LICENSE,Apache Li
 coreos/go-systemd,https://github.com/coreos/go-systemd/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/coreos/go-systemd/main/LICENSE
 creack/pty,https://github.com/creack/pty/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/creack/pty/master/LICENSE
 davecgh/go-spew,https://github.com/davecgh/go-spew/blob/master/LICENSE,ISC License,https://raw.githubusercontent.com/davecgh/go-spew/master/LICENSE
-deepmap/oapi-codegen,https://github.com/deepmap/oapi-codegen/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/deepmap/oapi-codegen/master/LICENSE
+deepmap/oapi-codegen,https://github.com/oapi-codegen/oapi-codegen/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/main/LICENSE
 denisenkom/go-mssqldb,https://github.com/denisenkom/go-mssqldb/blob/master/LICENSE.txt,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/denisenkom/go-mssqldb/master/LICENSE.txt
 devigned/tab,https://github.com/devigned/tab/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/devigned/tab/master/LICENSE
 dgrijalva/jwt-go,https://github.com/dgrijalva/jwt-go/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/dgrijalva/jwt-go/master/LICENSE
@@ -75,6 +74,7 @@ fogleman/gg,https://github.com/fogleman/gg/blob/master/LICENSE.md,MIT License,ht
 fortytw2/leaktest,https://github.com/fortytw2/leaktest/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/fortytw2/leaktest/master/LICENSE
 fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/main/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/fsnotify/fsnotify/main/LICENSE
 ghodss/yaml,https://github.com/ghodss/yaml/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/ghodss/yaml/master/LICENSE
+go-errors/errors,https://github.com/go-errors/errors/blob/master/LICENSE.MIT,MIT License,https://raw.githubusercontent.com/go-errors/errors/master/LICENSE.MIT
 go-gl/glfw,https://github.com/go-gl/glfw/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/go-gl/glfw/master/LICENSE
 go-kit/kit,https://github.com/go-kit/kit/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/go-kit/kit/master/LICENSE
 go-kit/log,https://github.com/go-kit/log/blob/main/LICENSE,MIT License,https://raw.githubusercontent.com/go-kit/log/main/LICENSE
@@ -95,7 +95,7 @@ go-stack/stack,https://github.com/go-stack/stack/blob/master/LICENSE.md,MIT Lice
 go-task/slim-sprig,https://github.com/go-task/slim-sprig/blob/master/LICENSE.txt,MIT License,https://raw.githubusercontent.com/go-task/slim-sprig/master/LICENSE.txt
 gobuffalo/flect,https://github.com/gobuffalo/flect/blob/main/LICENSE,MIT License,https://raw.githubusercontent.com/gobuffalo/flect/main/LICENSE
 gobwas/glob,https://github.com/gobwas/glob/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/gobwas/glob/master/LICENSE
-gocql/gocql,https://github.com/gocql/gocql/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/gocql/gocql/master/LICENSE
+gocql/gocql,https://github.com/apache/cassandra-gocql-driver/blob/trunk/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/apache/cassandra-gocql-driver/trunk/LICENSE
 gogo/protobuf,https://github.com/gogo/protobuf/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/gogo/protobuf/master/LICENSE
 golang-jwt/jwt,https://github.com/golang-jwt/jwt/blob/main/LICENSE,MIT License,https://raw.githubusercontent.com/golang-jwt/jwt/main/LICENSE
 golang-sql/civil,https://github.com/golang-sql/civil/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/golang-sql/civil/master/LICENSE
@@ -122,7 +122,7 @@ googleapis/gnostic,https://github.com/google/gnostic/blob/main/LICENSE,Apache Li
 googleapis/go-type-adapters,https://github.com/googleapis/go-type-adapters/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/googleapis/go-type-adapters/main/LICENSE
 gorilla/context,https://github.com/gorilla/context/blob/main/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/gorilla/context/main/LICENSE
 gorilla/mux,https://github.com/gorilla/mux/blob/main/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/gorilla/mux/main/LICENSE
-gorilla/websocket,https://github.com/gorilla/websocket/blob/main/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/gorilla/websocket/main/LICENSE
+gorilla/websocket,https://github.com/gorilla/websocket/blob/main/LICENSE,BSD 2-Clause "Simplified" License,https://raw.githubusercontent.com/gorilla/websocket/main/LICENSE
 gregjones/httpcache,https://github.com/gregjones/httpcache/blob/master/LICENSE.txt,MIT License,https://raw.githubusercontent.com/gregjones/httpcache/master/LICENSE.txt
 grpc-ecosystem/go-grpc-middleware,https://github.com/grpc-ecosystem/go-grpc-middleware/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/grpc-ecosystem/go-grpc-middleware/main/LICENSE
 grpc-ecosystem/go-grpc-prometheus,https://github.com/grpc-ecosystem/go-grpc-prometheus/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/grpc-ecosystem/go-grpc-prometheus/master/LICENSE
@@ -155,7 +155,7 @@ jcmturner/dnsutils,https://github.com/jcmturner/dnsutils/blob/master/LICENSE,Apa
 jcmturner/gofork,https://github.com/jcmturner/gofork/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/jcmturner/gofork/master/LICENSE
 jcmturner/gokrb5,https://github.com/jcmturner/gokrb5/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/jcmturner/gokrb5/master/LICENSE
 jcmturner/rpc,https://github.com/jcmturner/rpc/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/jcmturner/rpc/master/LICENSE
-jessevdk/go-flags,https://github.com/jessevdk/go-flags/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/jessevdk/go-flags/master/LICENSE
+jessevdk/go-flags,https://github.com/jessevdk/go-flags/blob/main/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/jessevdk/go-flags/main/LICENSE
 jmespath/go-jmespath,https://github.com/jmespath/go-jmespath/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/jmespath/go-jmespath/master/LICENSE
 jonboulle/clockwork,https://github.com/jonboulle/clockwork/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/jonboulle/clockwork/master/LICENSE
 josharian/intern,https://github.com/josharian/intern/blob/master/LICENSE.md,MIT License,https://raw.githubusercontent.com/josharian/intern/master/LICENSE.md
@@ -193,14 +193,15 @@ moby/spdystream,https://github.com/moby/spdystream/blob/master/LICENSE,Apache Li
 moby/term,https://github.com/moby/term/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/moby/term/main/LICENSE
 modern-go/concurrent,https://github.com/modern-go/concurrent/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/modern-go/concurrent/master/LICENSE
 modern-go/reflect2,https://github.com/modern-go/reflect2/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/modern-go/reflect2/master/LICENSE
+monochromegane/go-gitignore,https://github.com/monochromegane/go-gitignore/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/monochromegane/go-gitignore/master/LICENSE
 munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/munnerz/goautoneg/master/LICENSE
 mwitkow/go-conntrack,https://github.com/mwitkow/go-conntrack/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/mwitkow/go-conntrack/master/LICENSE
 mxk/go-flowrate,https://github.com/mxk/go-flowrate/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/mxk/go-flowrate/master/LICENSE
 nats-io/jwt,https://github.com/nats-io/jwt/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/nats-io/jwt/main/LICENSE
 nats-io/nats-server,https://github.com/nats-io/nats-server/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/nats-io/nats-server/main/LICENSE
 nats-io/nats.go,https://github.com/nats-io/nats.go/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/nats-io/nats.go/main/LICENSE
 nats-io/nkeys,https://github.com/nats-io/nkeys/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/nats-io/nkeys/main/LICENSE
-nats-io/nuid,https://github.com/nats-io/nuid/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/nats-io/nuid/master/LICENSE
+nats-io/nuid,https://github.com/nats-io/nuid/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/nats-io/nuid/main/LICENSE
 newrelic/newrelic-client-go,https://github.com/newrelic/newrelic-client-go/blob/main/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/newrelic/newrelic-client-go/main/LICENSE
 niemeyer/pretty,https://github.com/niemeyer/pretty/blob/master/License,MIT License,https://raw.githubusercontent.com/niemeyer/pretty/master/License
 nxadm/tail,https://github.com/nxadm/tail/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/nxadm/tail/master/LICENSE
@@ -225,8 +226,10 @@ robfig/cron,https://github.com/robfig/cron/blob/master/LICENSE,MIT License,https
 rogpeppe/fastuuid,https://github.com/rogpeppe/fastuuid/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/rogpeppe/fastuuid/master/LICENSE
 rogpeppe/go-internal,https://github.com/rogpeppe/go-internal/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/rogpeppe/go-internal/master/LICENSE
 ryanuber/go-glob,https://github.com/ryanuber/go-glob/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/ryanuber/go-glob/master/LICENSE
+sergi/go-diff,https://github.com/sergi/go-diff/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/sergi/go-diff/master/LICENSE
 sirupsen/logrus,https://github.com/sirupsen/logrus/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/sirupsen/logrus/master/LICENSE
 soheilhy/cmux,https://github.com/soheilhy/cmux/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/soheilhy/cmux/master/LICENSE
+spf13/afero,https://github.com/spf13/afero/blob/master/LICENSE.txt,Apache License 2.0,https://raw.githubusercontent.com/spf13/afero/master/LICENSE.txt
 spf13/cobra,https://github.com/spf13/cobra/blob/main/LICENSE.txt,Apache License 2.0,https://raw.githubusercontent.com/spf13/cobra/main/LICENSE.txt
 spf13/pflag,https://github.com/spf13/pflag/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/spf13/pflag/master/LICENSE
 stoewer/go-strcase,https://github.com/stoewer/go-strcase/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/stoewer/go-strcase/master/LICENSE
@@ -253,11 +256,12 @@ xdg/scram,https://github.com/xdg/scram/blob/master/LICENSE,Apache License 2.0,ht
 xdg/stringprep,https://github.com/xdg/stringprep/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/xdg/stringprep/master/LICENSE
 xhit/go-str2duration,https://github.com/xhit/go-str2duration/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/xhit/go-str2duration/master/LICENSE
 xiang90/probing,https://github.com/xiang90/probing/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/xiang90/probing/master/LICENSE
+xlab/treeprint,https://github.com/xlab/treeprint/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/xlab/treeprint/master/LICENSE
 youmark/pkcs8,https://github.com/youmark/pkcs8/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/youmark/pkcs8/master/LICENSE
 yuin/goldmark,https://github.com/yuin/goldmark/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/yuin/goldmark/master/LICENSE
 go-check/check,https://github.com/go-check/check/blob/v1/LICENSE,BSD 2-Clause "Simplified" License,https://raw.githubusercontent.com/go-check/check/v1/LICENSE
 go-inf/inf,https://github.com/go-inf/inf/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/go-inf/inf/master/LICENSE
 natefinch/lumberjack,https://github.com/natefinch/lumberjack/blob/v2.0/LICENSE,MIT License,https://raw.githubusercontent.com/natefinch/lumberjack/v2.0/LICENSE
-go-resty/resty,https://github.com/go-resty/resty/blob/v2/LICENSE,MIT License,https://raw.githubusercontent.com/go-resty/resty/v2/LICENSE
+go-resty/resty,https://github.com/go-resty/resty/blob/v3/LICENSE,MIT License,https://raw.githubusercontent.com/go-resty/resty/v3/LICENSE
 go-tomb/tomb,https://github.com/go-tomb/tomb/blob/v1/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/go-tomb/tomb/v1/LICENSE
 go-yaml/yaml,https://github.com/go-yaml/yaml/blob/v3/LICENSE,MIT License,https://raw.githubusercontent.com/go-yaml/yaml/v3/LICENSE

executor/licenses/license_info.csv

@@ -34,7 +34,6 @@ armon/go-socks5
 asaskevich/govalidator
 aws/aws-sdk-go
 banzaicloud/k8s-objectmatcher
-benbjohnson/clock
 beorn7/perks
 blang/semver
 blendle/zapdriver
@@ -77,6 +76,7 @@ fogleman/gg
 fortytw2/leaktest
 fsnotify/fsnotify
 ghodss/yaml
+go-errors/errors
 go-gl/glfw
 go-kit/kit
 go-kit/log
@@ -195,6 +195,7 @@ moby/spdystream
 moby/term
 modern-go/concurrent
 modern-go/reflect2
+monochromegane/go-gitignore
 munnerz/goautoneg
 mwitkow/go-conntrack
 mxk/go-flowrate
@@ -227,8 +228,10 @@ robfig/cron
 rogpeppe/fastuuid
 rogpeppe/go-internal
 ryanuber/go-glob
+sergi/go-diff
 sirupsen/logrus
 soheilhy/cmux
+spf13/afero
 spf13/cobra
 spf13/pflag
 stoewer/go-strcase
@@ -255,6 +258,7 @@ xdg/scram
 xdg/stringprep
 xhit/go-str2duration
 xiang90/probing
+xlab/treeprint
 youmark/pkcs8
 yuin/goldmark
 https://github.com/golang/go

executor/licenses/repo.txt

@@ -1,15 +1,20 @@
-    166 Apache License 2.0
-     22 Apache Software License
-      2 Apache Software License; BSD License
-     11 BSD 2-Clause Simplified License
-      1 BSD-3-Clause
-     76 BSD 3-Clause New or Revised License
-     19 BSD License
-      1 Business Source License 1.1
+      1 3-Clause BSD License
+      3 Apache-2.0
+      1 Apache-2.0 AND BSD-2-Clause
+      1 Apache-2.0 OR BSD-3-Clause
+    172 Apache License 2.0
+     13 Apache Software License
+      1 Apache Software License; BSD License
+     15 BSD 2-Clause Simplified License
+      7 BSD-3-Clause
+     75 BSD 3-Clause New or Revised License
+      8 BSD License
+      3 Business Source License 1.1
       1 Creative Commons Attribution 4.0 International Public License
       4 ISC License
-      1 MIT
+     11 MIT
     244 MIT License
      34 Mozilla Public License 2.0
       1 Mozilla Public License 2.0 (MPL 2.0)
-      1 Python Software Foundation License
+      1 PSF-2.0
+      1 UNKNOWN

licenses/3rd-party-summary.txt

@@ -0,0 +1 @@
+seldonio/seldon-core,master

licenses/branch_refs.manual.csv

@@ -228,7 +228,8 @@ licenses: licenses/dep.txt
 		-o licenses/repo.txt \
 		--manual-dep-repo-mapping ../licenses/dep_repo.manual.csv \
 		licenses/dep.txt
-	get-github-license-info -o licenses/license_info.csv licenses/repo.txt
+	get-github-license-info -o licenses/license_info.csv licenses/repo.txt \
+		--branch-refs ../licenses/branch_refs.manual.csv
 	python -m 'patch_additional_license_info' \
 		licenses/license_info.csv \
 		../licenses/additional_license_info.csv