From 7716dd33d812c464d7d49e56b3f581b768827092 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 7 Nov 2023 15:18:32 -0500 Subject: [PATCH] licensescan: Add a few more licenses for recent updates (#4080) Also explicitly specify the license url for kpt itself, to avoid picking up the demo-magic license. Signed-off-by: justinsb --- .../modules/github.com/GoogleContainerTools/kpt/(devel).yaml | 1 + .../kpt/v1.0.0-beta.23.0.20221117142901-c67b11f2e138.yaml | 5 ++++- .../github.com/GoogleContainerTools/kpt/v1.0.0-beta.24.yaml | 5 ++++- .../github.com/docker/docker/v24.0.7+incompatible.yaml | 2 ++ .../github.com/emicklei/go-restful/v2.16.0+incompatible.yaml | 2 ++ .../github.com/opencontainers/image-spec/v1.1.0-rc3.yaml | 2 ++ tools/licensescan/modules/golang.org/x/crypto/v0.14.0.yaml | 2 ++ tools/licensescan/modules/golang.org/x/mod/v0.8.0.yaml | 2 ++ tools/licensescan/modules/golang.org/x/net/v0.17.0.yaml | 2 ++ tools/licensescan/modules/golang.org/x/sys/v0.13.0.yaml | 2 ++ tools/licensescan/modules/golang.org/x/term/v0.13.0.yaml | 2 ++ tools/licensescan/modules/golang.org/x/text/v0.13.0.yaml | 2 ++ 12 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 tools/licensescan/modules/github.com/docker/docker/v24.0.7+incompatible.yaml create mode 100644 tools/licensescan/modules/github.com/emicklei/go-restful/v2.16.0+incompatible.yaml create mode 100644 tools/licensescan/modules/github.com/opencontainers/image-spec/v1.1.0-rc3.yaml create mode 100644 tools/licensescan/modules/golang.org/x/crypto/v0.14.0.yaml create mode 100644 tools/licensescan/modules/golang.org/x/mod/v0.8.0.yaml create mode 100644 tools/licensescan/modules/golang.org/x/net/v0.17.0.yaml create mode 100644 tools/licensescan/modules/golang.org/x/sys/v0.13.0.yaml create mode 100644 tools/licensescan/modules/golang.org/x/term/v0.13.0.yaml create mode 100644 tools/licensescan/modules/golang.org/x/text/v0.13.0.yaml diff --git a/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/(devel).yaml b/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/(devel).yaml index a600beb799..9e45813304 100644 --- a/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/(devel).yaml +++ b/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/(devel).yaml @@ -1,4 +1,5 @@ # https://pkg.go.dev/github.com/GoogleContainerTools/kpt@(devel) license: Apache-2.0 +# Specifying the licenseURL here avoids picking up the demo-magic license licenseURLs: - https://raw.githubusercontent.com/GoogleContainerTools/kpt/main/LICENSE \ No newline at end of file diff --git a/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.23.0.20221117142901-c67b11f2e138.yaml b/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.23.0.20221117142901-c67b11f2e138.yaml index ea26673478..68aa0c1d7a 100644 --- a/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.23.0.20221117142901-c67b11f2e138.yaml +++ b/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.23.0.20221117142901-c67b11f2e138.yaml @@ -1,2 +1,5 @@ # https://pkg.go.dev/github.com/GoogleContainerTools/kpt@v1.0.0-beta.23.0.20221117142901-c67b11f2e138 -license: Apache-2.0 \ No newline at end of file +license: Apache-2.0 +# Specifying the licenseURL here avoids picking up the demo-magic license +licenseURLs: +- https://raw.githubusercontent.com/GoogleContainerTools/kpt/v1.0.0-beta.23/LICENSE diff --git a/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.24.yaml b/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.24.yaml index 37e3a6dbaa..b6d6b93f0d 100644 --- a/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.24.yaml +++ b/tools/licensescan/modules/github.com/GoogleContainerTools/kpt/v1.0.0-beta.24.yaml @@ -1,2 +1,5 @@ # https://pkg.go.dev/github.com/GoogleContainerTools/kpt@v1.0.0-beta.24 -license: Apache-2.0 \ No newline at end of file +license: Apache-2.0 +# Specifying the licenseURL here avoids picking up the demo-magic license +licenseURLs: +- https://raw.githubusercontent.com/GoogleContainerTools/kpt/v1.0.0-beta.24/LICENSE diff --git a/tools/licensescan/modules/github.com/docker/docker/v24.0.7+incompatible.yaml b/tools/licensescan/modules/github.com/docker/docker/v24.0.7+incompatible.yaml new file mode 100644 index 0000000000..447e8ff1fe --- /dev/null +++ b/tools/licensescan/modules/github.com/docker/docker/v24.0.7+incompatible.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/github.com/docker/docker@v24.0.7+incompatible +license: Apache-2.0 diff --git a/tools/licensescan/modules/github.com/emicklei/go-restful/v2.16.0+incompatible.yaml b/tools/licensescan/modules/github.com/emicklei/go-restful/v2.16.0+incompatible.yaml new file mode 100644 index 0000000000..8c24d87fb1 --- /dev/null +++ b/tools/licensescan/modules/github.com/emicklei/go-restful/v2.16.0+incompatible.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/github.com/emicklei/go-restful@v2.16.0+incompatible +license: MIT \ No newline at end of file diff --git a/tools/licensescan/modules/github.com/opencontainers/image-spec/v1.1.0-rc3.yaml b/tools/licensescan/modules/github.com/opencontainers/image-spec/v1.1.0-rc3.yaml new file mode 100644 index 0000000000..fb79de4a10 --- /dev/null +++ b/tools/licensescan/modules/github.com/opencontainers/image-spec/v1.1.0-rc3.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/github.com/opencontainers/image-spec@v1.1.0-rc3 +license: Apache-2.0 diff --git a/tools/licensescan/modules/golang.org/x/crypto/v0.14.0.yaml b/tools/licensescan/modules/golang.org/x/crypto/v0.14.0.yaml new file mode 100644 index 0000000000..d17def8900 --- /dev/null +++ b/tools/licensescan/modules/golang.org/x/crypto/v0.14.0.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/golang.org/x/crypto@v0.14.0 +license: BSD-3-Clause \ No newline at end of file diff --git a/tools/licensescan/modules/golang.org/x/mod/v0.8.0.yaml b/tools/licensescan/modules/golang.org/x/mod/v0.8.0.yaml new file mode 100644 index 0000000000..7841edd9b7 --- /dev/null +++ b/tools/licensescan/modules/golang.org/x/mod/v0.8.0.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/golang.org/x/mod@v0.8.0 +license: BSD-3-Clause \ No newline at end of file diff --git a/tools/licensescan/modules/golang.org/x/net/v0.17.0.yaml b/tools/licensescan/modules/golang.org/x/net/v0.17.0.yaml new file mode 100644 index 0000000000..4586045c01 --- /dev/null +++ b/tools/licensescan/modules/golang.org/x/net/v0.17.0.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/golang.org/x/net@v0.17.0 +license: BSD-3-Clause \ No newline at end of file diff --git a/tools/licensescan/modules/golang.org/x/sys/v0.13.0.yaml b/tools/licensescan/modules/golang.org/x/sys/v0.13.0.yaml new file mode 100644 index 0000000000..35e4653b7b --- /dev/null +++ b/tools/licensescan/modules/golang.org/x/sys/v0.13.0.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/golang.org/x/sys@v0.13.0 +license: BSD-3-Clause \ No newline at end of file diff --git a/tools/licensescan/modules/golang.org/x/term/v0.13.0.yaml b/tools/licensescan/modules/golang.org/x/term/v0.13.0.yaml new file mode 100644 index 0000000000..12e38c39bb --- /dev/null +++ b/tools/licensescan/modules/golang.org/x/term/v0.13.0.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/golang.org/x/term@v0.13.0 +license: BSD-3-Clause \ No newline at end of file diff --git a/tools/licensescan/modules/golang.org/x/text/v0.13.0.yaml b/tools/licensescan/modules/golang.org/x/text/v0.13.0.yaml new file mode 100644 index 0000000000..ade31704a9 --- /dev/null +++ b/tools/licensescan/modules/golang.org/x/text/v0.13.0.yaml @@ -0,0 +1,2 @@ +# https://pkg.go.dev/golang.org/x/text@v0.13.0 +license: BSD-3-Clause \ No newline at end of file