From 49d62a817688aa048d8e9e605524865e2f2fa990 Mon Sep 17 00:00:00 2001 From: yahavi Date: Fri, 3 Dec 2021 16:43:55 +0200 Subject: [PATCH] Upgrade codegangsta CLI to 1.22.5 --- artifactory/commands/utils/configfile.go | 2 +- artifactory/commands/utils/configfile_test.go | 2 +- docs/common/helputils.go | 2 +- go.mod | 2 +- go.sum | 7 +++++-- plugins/components/conversionlayer.go | 2 +- plugins/pluginmain.go | 2 +- plugins/signature.go | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/artifactory/commands/utils/configfile.go b/artifactory/commands/utils/configfile.go index d5062d396..2217c914d 100644 --- a/artifactory/commands/utils/configfile.go +++ b/artifactory/commands/utils/configfile.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - "github.com/codegangsta/cli" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/utils/config" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" "github.com/jfrog/jfrog-client-go/utils/errorutils" "github.com/jfrog/jfrog-client-go/utils/io/fileutils" "github.com/jfrog/jfrog-client-go/utils/log" + "github.com/urfave/cli" "gopkg.in/yaml.v2" ) diff --git a/artifactory/commands/utils/configfile_test.go b/artifactory/commands/utils/configfile_test.go index 8128f0d2b..e5692c971 100644 --- a/artifactory/commands/utils/configfile_test.go +++ b/artifactory/commands/utils/configfile_test.go @@ -7,7 +7,6 @@ import ( "strings" "testing" - "github.com/codegangsta/cli" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/common/tests" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" @@ -15,6 +14,7 @@ import ( clientlog "github.com/jfrog/jfrog-client-go/utils/log" "github.com/spf13/viper" "github.com/stretchr/testify/assert" + "github.com/urfave/cli" ) func init() { diff --git a/docs/common/helputils.go b/docs/common/helputils.go index 046255118..f9c72eca7 100644 --- a/docs/common/helputils.go +++ b/docs/common/helputils.go @@ -2,8 +2,8 @@ package common import ( "fmt" - "github.com/codegangsta/cli" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" + "github.com/urfave/cli" ) func CreateUsage(command string, name string, commands []string) string { diff --git a/go.mod b/go.mod index b20b15cf9..a53efe48f 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/buger/jsonparser v1.1.1 github.com/c-bata/go-prompt v0.2.5 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e - github.com/codegangsta/cli v1.20.0 github.com/google/uuid v1.3.0 github.com/gookit/color v1.4.2 github.com/jedib0t/go-pretty/v6 v6.2.2 @@ -21,6 +20,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.7.0 + github.com/urfave/cli v1.22.5 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 golang.org/x/mod v0.4.2 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 2ec20b4b6..a6684bf23 100644 --- a/go.sum +++ b/go.sum @@ -73,10 +73,9 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/codegangsta/cli v1.20.0 h1:iX1FXEgwzd5+XN6wk5cVHOGQj6Q3Dcp20lUeS4lHNTw= -github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -322,11 +321,13 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -357,6 +358,8 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= +github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= diff --git a/plugins/components/conversionlayer.go b/plugins/components/conversionlayer.go index a9de74ae5..e0131838b 100644 --- a/plugins/components/conversionlayer.go +++ b/plugins/components/conversionlayer.go @@ -3,9 +3,9 @@ package components import ( "errors" "fmt" - "github.com/codegangsta/cli" "github.com/jfrog/jfrog-cli-core/v2/docs/common" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" + "github.com/urfave/cli" "strings" ) diff --git a/plugins/pluginmain.go b/plugins/pluginmain.go index 5dd12270d..ce4b75bbd 100644 --- a/plugins/pluginmain.go +++ b/plugins/pluginmain.go @@ -1,7 +1,6 @@ package plugins import ( - "github.com/codegangsta/cli" jfrogclicore "github.com/jfrog/jfrog-cli-core/v2" "github.com/jfrog/jfrog-cli-core/v2/plugins/components" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" @@ -9,6 +8,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils" "github.com/jfrog/jfrog-client-go/utils/io/fileutils" clientLog "github.com/jfrog/jfrog-client-go/utils/log" + "github.com/urfave/cli" "os" ) diff --git a/plugins/signature.go b/plugins/signature.go index 3cd0152f7..9597920e1 100644 --- a/plugins/signature.go +++ b/plugins/signature.go @@ -2,10 +2,10 @@ package plugins import ( "encoding/json" - "github.com/codegangsta/cli" "github.com/jfrog/jfrog-cli-core/v2/plugins/components" clientutils "github.com/jfrog/jfrog-client-go/utils" "github.com/jfrog/jfrog-client-go/utils/log" + "github.com/urfave/cli" ) const SignatureCommandName = "hidden-plugin-signature"