Skip to content

Commit 8ccd3b3

Browse files
authored
Merge pull request moby#3450 from jedevc/vendor-spdx-8e09d22f514a
vendor: update spdx/tools-golang to d6f58551be3f
2 parents 7619d69 + 3ea031c commit 8ccd3b3

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
github.com/pkg/profile v1.5.0
6060
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
6161
github.com/sirupsen/logrus v1.9.0
62-
github.com/spdx/tools-golang v0.3.1-0.20221108182156-8a01147e6342
62+
github.com/spdx/tools-golang v0.3.1-0.20230104082527-d6f58551be3f
6363
github.com/stretchr/testify v1.8.0
6464
github.com/tonistiigi/fsutil v0.0.0-20221114235510-0127568185cf
6565
github.com/tonistiigi/go-actions-cache v0.0.0-20220404170428-0bdeb6e1eac7
@@ -152,5 +152,3 @@ require (
152152
golang.org/x/text v0.5.0 // indirect
153153
gopkg.in/yaml.v3 v3.0.1 // indirect
154154
)
155-
156-
replace github.com/spdx/tools-golang => github.com/jedevc/spdx-tools-golang v0.0.0-20221205121515-6fe9d226281a

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,8 +912,6 @@ github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6t
912912
github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
913913
github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea/go.mod h1:QMdK4dGB3YhEW2BmA1wgGpPYI3HZy/5gD705PXKUVSg=
914914
github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
915-
github.com/jedevc/spdx-tools-golang v0.0.0-20221205121515-6fe9d226281a h1:oEb/YxUfXfGhRJVEg4yBfSnB6ZgS9aBu4RAM0fB9XsA=
916-
github.com/jedevc/spdx-tools-golang v0.0.0-20221205121515-6fe9d226281a/go.mod h1:VHzvNsKAfAGqs4ZvwRL+7a0dNsL20s7lGui4K9C0xQM=
917915
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
918916
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s=
919917
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0=
@@ -1318,6 +1316,8 @@ github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34c
13181316
github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak=
13191317
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
13201318
github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM=
1319+
github.com/spdx/tools-golang v0.3.1-0.20230104082527-d6f58551be3f h1:9B623Cfs+mclYK6dsae7gLSwuIBHvlgmEup87qpqsAQ=
1320+
github.com/spdx/tools-golang v0.3.1-0.20230104082527-d6f58551be3f/go.mod h1:VHzvNsKAfAGqs4ZvwRL+7a0dNsL20s7lGui4K9C0xQM=
13211321
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
13221322
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
13231323
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=

vendor/github.com/spdx/tools-golang/spdx/v2_2/package.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/spdx/tools-golang/spdx/v2_3/package.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ github.com/shibumi/go-pathspec
666666
# github.com/sirupsen/logrus v1.9.0
667667
## explicit; go 1.13
668668
github.com/sirupsen/logrus
669-
# github.com/spdx/tools-golang v0.3.1-0.20221108182156-8a01147e6342 => github.com/jedevc/spdx-tools-golang v0.0.0-20221205121515-6fe9d226281a
669+
# github.com/spdx/tools-golang v0.3.1-0.20230104082527-d6f58551be3f
670670
## explicit; go 1.13
671671
github.com/spdx/tools-golang/json
672672
github.com/spdx/tools-golang/spdx/common
@@ -928,4 +928,3 @@ google.golang.org/protobuf/types/pluginpb
928928
# gopkg.in/yaml.v3 v3.0.1
929929
## explicit
930930
gopkg.in/yaml.v3
931-
# github.com/spdx/tools-golang => github.com/jedevc/spdx-tools-golang v0.0.0-20221205121515-6fe9d226281a

0 commit comments

Comments
 (0)