From 4513fde8050cff95da2053f335792996b49da355 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 10 Nov 2022 10:52:44 +0100 Subject: [PATCH] test/tools: bump module to go 1.17 Signed-off-by: Valentin Rothberg --- test/tools/go.mod | 11 ++++++++++- .../github.com/cpuguy83/go-md2man/v2/go.mod | 5 ----- .../github.com/cpuguy83/go-md2man/v2/go.sum | 2 -- .../vendor/github.com/hashicorp/go-version/go.mod | 1 - .../go-windows-terminal-sequences/go.mod | 1 - .../github.com/russross/blackfriday/v2/go.mod | 1 - .../vendor/github.com/sirupsen/logrus/go.mod | 10 ---------- .../vendor/github.com/sirupsen/logrus/go.sum | 13 ------------- .../github.com/vbatts/git-validation/go.mod | 8 -------- .../github.com/vbatts/git-validation/go.sum | 15 --------------- test/tools/vendor/modules.txt | 12 +++++++++--- 11 files changed, 19 insertions(+), 60 deletions(-) delete mode 100644 test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.mod delete mode 100644 test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.sum delete mode 100644 test/tools/vendor/github.com/hashicorp/go-version/go.mod delete mode 100644 test/tools/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod delete mode 100644 test/tools/vendor/github.com/russross/blackfriday/v2/go.mod delete mode 100644 test/tools/vendor/github.com/sirupsen/logrus/go.mod delete mode 100644 test/tools/vendor/github.com/sirupsen/logrus/go.sum delete mode 100644 test/tools/vendor/github.com/vbatts/git-validation/go.mod delete mode 100644 test/tools/vendor/github.com/vbatts/git-validation/go.sum diff --git a/test/tools/go.mod b/test/tools/go.mod index 8758330c85..fc8e863443 100644 --- a/test/tools/go.mod +++ b/test/tools/go.mod @@ -1,9 +1,18 @@ module github.com/containers/podman/test/tools -go 1.16 +go 1.17 require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 github.com/vbatts/git-validation v1.1.0 golang.org/x/tools v0.2.0 ) + +require ( + github.com/hashicorp/go-version v1.2.0 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/sirupsen/logrus v1.4.1 // indirect + golang.org/x/mod v0.6.0 // indirect + golang.org/x/sys v0.1.0 // indirect +) diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.mod b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.mod deleted file mode 100644 index 0bc888da0d..0000000000 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/cpuguy83/go-md2man/v2 - -go 1.11 - -require github.com/russross/blackfriday/v2 v2.1.0 diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.sum b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.sum deleted file mode 100644 index 502a072c0a..0000000000 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= diff --git a/test/tools/vendor/github.com/hashicorp/go-version/go.mod b/test/tools/vendor/github.com/hashicorp/go-version/go.mod deleted file mode 100644 index f5285555fa..0000000000 --- a/test/tools/vendor/github.com/hashicorp/go-version/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/hashicorp/go-version diff --git a/test/tools/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod b/test/tools/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod deleted file mode 100644 index 716c613125..0000000000 --- a/test/tools/vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/konsorten/go-windows-terminal-sequences diff --git a/test/tools/vendor/github.com/russross/blackfriday/v2/go.mod b/test/tools/vendor/github.com/russross/blackfriday/v2/go.mod deleted file mode 100644 index 620b74e0ac..0000000000 --- a/test/tools/vendor/github.com/russross/blackfriday/v2/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/russross/blackfriday/v2 diff --git a/test/tools/vendor/github.com/sirupsen/logrus/go.mod b/test/tools/vendor/github.com/sirupsen/logrus/go.mod deleted file mode 100644 index 8261a2b3a2..0000000000 --- a/test/tools/vendor/github.com/sirupsen/logrus/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module github.com/sirupsen/logrus - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/konsorten/go-windows-terminal-sequences v1.0.1 - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.1.1 // indirect - github.com/stretchr/testify v1.2.2 - golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 -) diff --git a/test/tools/vendor/github.com/sirupsen/logrus/go.sum b/test/tools/vendor/github.com/sirupsen/logrus/go.sum deleted file mode 100644 index 2d787be60d..0000000000 --- a/test/tools/vendor/github.com/sirupsen/logrus/go.sum +++ /dev/null @@ -1,13 +0,0 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs= -github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/test/tools/vendor/github.com/vbatts/git-validation/go.mod b/test/tools/vendor/github.com/vbatts/git-validation/go.mod deleted file mode 100644 index 14b7069e79..0000000000 --- a/test/tools/vendor/github.com/vbatts/git-validation/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/vbatts/git-validation - -go 1.12 - -require ( - github.com/hashicorp/go-version v1.2.0 - github.com/sirupsen/logrus v1.4.1 -) diff --git a/test/tools/vendor/github.com/vbatts/git-validation/go.sum b/test/tools/vendor/github.com/vbatts/git-validation/go.sum deleted file mode 100644 index 265941fe3f..0000000000 --- a/test/tools/vendor/github.com/vbatts/git-validation/go.sum +++ /dev/null @@ -1,15 +0,0 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/test/tools/vendor/modules.txt b/test/tools/vendor/modules.txt index 288d07349e..6a73087cc7 100644 --- a/test/tools/vendor/modules.txt +++ b/test/tools/vendor/modules.txt @@ -1,17 +1,21 @@ # github.com/cpuguy83/go-md2man/v2 v2.0.2 -## explicit +## explicit; go 1.11 github.com/cpuguy83/go-md2man/v2 github.com/cpuguy83/go-md2man/v2/md2man # github.com/hashicorp/go-version v1.2.0 +## explicit github.com/hashicorp/go-version # github.com/konsorten/go-windows-terminal-sequences v1.0.1 +## explicit github.com/konsorten/go-windows-terminal-sequences # github.com/russross/blackfriday/v2 v2.1.0 +## explicit github.com/russross/blackfriday/v2 # github.com/sirupsen/logrus v1.4.1 +## explicit github.com/sirupsen/logrus # github.com/vbatts/git-validation v1.1.0 -## explicit +## explicit; go 1.12 github.com/vbatts/git-validation github.com/vbatts/git-validation/git github.com/vbatts/git-validation/rules/danglingwhitespace @@ -20,14 +24,16 @@ github.com/vbatts/git-validation/rules/messageregexp github.com/vbatts/git-validation/rules/shortsubject github.com/vbatts/git-validation/validate # golang.org/x/mod v0.6.0 +## explicit; go 1.17 golang.org/x/mod/internal/lazyregexp golang.org/x/mod/module golang.org/x/mod/semver # golang.org/x/sys v0.1.0 +## explicit; go 1.17 golang.org/x/sys/execabs golang.org/x/sys/unix # golang.org/x/tools v0.2.0 -## explicit +## explicit; go 1.18 golang.org/x/tools/cmd/goimports golang.org/x/tools/go/ast/astutil golang.org/x/tools/internal/event