Skip to content

Commit 9c7d45e

Browse files
committed
Bump go-licenses to v2
1 parent c866390 commit 9c7d45e

File tree

4 files changed

+104
-280
lines changed

4 files changed

+104
-280
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ DOTFILE_IMAGE = $(subst /,_,$(IMAGE))-$(OS_ARCH_TAG)
149149
LICENSES = .licenses
150150

151151
$(LICENSES):
152-
pushd tools >/dev/null; \
153-
export GOOS=$(shell go env GOHOSTOS); \
154-
export GOARCH=$(shell go env GOHOSTARCH); \
155-
go build -o ../bin/tools github.com/google/go-licenses; \
152+
pushd tools >/dev/null; \
153+
export GOOS=$(shell go env GOHOSTOS); \
154+
export GOARCH=$(shell go env GOHOSTARCH); \
155+
go build -o ../bin/tools/ github.com/google/go-licenses/v2; \
156156
popd >/dev/null
157157
rm -rf $(LICENSES)
158158
./bin/tools/go-licenses save ./... --save_path=$(LICENSES)

tools/go.mod

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,64 @@ go 1.18
44

55
require (
66
github.com/estesp/manifest-tool/v2 v2.0.5
7-
github.com/google/go-licenses v1.2.1
7+
github.com/google/go-licenses/v2 v2.0.0-alpha.1
88
)
99

1010
require (
1111
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
1212
github.com/beorn7/perks v1.0.1 // indirect
1313
github.com/cespare/xxhash/v2 v2.1.2 // indirect
1414
github.com/containerd/containerd v1.6.6 // indirect
15-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
15+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
16+
github.com/davecgh/go-spew v1.1.1 // indirect
1617
github.com/docker/cli v20.10.17+incompatible // indirect
1718
github.com/docker/distribution v2.8.1+incompatible // indirect
1819
github.com/docker/docker v20.10.17+incompatible // indirect
1920
github.com/docker/docker-credential-helpers v0.6.4 // indirect
2021
github.com/docker/go-connections v0.4.1-0.20190612165340-fd1b1942c4d5 // indirect
2122
github.com/docker/go-metrics v0.0.1 // indirect
2223
github.com/docker/go-units v0.4.0 // indirect
23-
github.com/emirpasic/gods v1.12.0 // indirect
2424
github.com/fatih/color v1.10.0 // indirect
25+
github.com/go-logr/logr v1.4.3 // indirect
2526
github.com/gogo/protobuf v1.3.2 // indirect
26-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
27-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
28-
github.com/golang/protobuf v1.5.2 // indirect
29-
github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148 // indirect
27+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
28+
github.com/golang/protobuf v1.5.4 // indirect
29+
github.com/google/licenseclassifier/v2 v2.0.0 // indirect
3030
github.com/gorilla/mux v1.8.0 // indirect
31-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
32-
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
33-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
31+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3432
github.com/klauspost/compress v1.13.6 // indirect
3533
github.com/mattn/go-colorable v0.1.8 // indirect
3634
github.com/mattn/go-isatty v0.0.12 // indirect
3735
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
38-
github.com/mitchellh/go-homedir v1.1.0 // indirect
3936
github.com/moby/locker v1.0.1 // indirect
4037
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
4138
github.com/morikuni/aec v1.0.0 // indirect
4239
github.com/opencontainers/go-digest v1.0.0 // indirect
4340
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
44-
github.com/otiai10/copy v1.6.0 // indirect
41+
github.com/otiai10/copy v1.14.1 // indirect
42+
github.com/otiai10/mint v1.6.3 // indirect
4543
github.com/pkg/errors v0.9.1 // indirect
4644
github.com/prometheus/client_golang v1.12.1 // indirect
4745
github.com/prometheus/client_model v0.2.0 // indirect
4846
github.com/prometheus/common v0.32.1 // indirect
4947
github.com/prometheus/procfs v0.7.3 // indirect
5048
github.com/russross/blackfriday/v2 v2.1.0 // indirect
51-
github.com/sergi/go-diff v1.2.0 // indirect
49+
github.com/sergi/go-diff v1.4.0 // indirect
5250
github.com/sirupsen/logrus v1.8.1 // indirect
53-
github.com/spf13/cobra v1.4.0 // indirect
54-
github.com/spf13/pflag v1.0.5 // indirect
55-
github.com/src-d/gcfg v1.4.0 // indirect
51+
github.com/spf13/cobra v1.9.1 // indirect
52+
github.com/spf13/pflag v1.0.6 // indirect
5653
github.com/urfave/cli v1.22.9 // indirect
57-
github.com/xanzy/ssh-agent v0.2.1 // indirect
58-
go.opencensus.io v0.23.0 // indirect
59-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
60-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
61-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
62-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
63-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
64-
golang.org/x/tools v0.1.10 // indirect
65-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
54+
go.opencensus.io v0.24.0 // indirect
55+
golang.org/x/mod v0.25.0 // indirect
56+
golang.org/x/net v0.41.0 // indirect
57+
golang.org/x/sync v0.15.0 // indirect
58+
golang.org/x/sys v0.33.0 // indirect
59+
golang.org/x/text v0.26.0 // indirect
60+
golang.org/x/tools v0.34.0 // indirect
6661
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
6762
google.golang.org/grpc v1.43.0 // indirect
68-
google.golang.org/protobuf v1.27.1 // indirect
69-
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
70-
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
71-
gopkg.in/warnings.v0 v0.1.2 // indirect
63+
google.golang.org/protobuf v1.33.0 // indirect
7264
gopkg.in/yaml.v2 v2.4.0 // indirect
65+
k8s.io/klog/v2 v2.130.1 // indirect
7366
oras.land/oras-go v1.2.0 // indirect
7467
)

0 commit comments

Comments
 (0)