diff --git a/go.mod b/go.mod index 42cd90552..c74d54b93 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821131943-b6162daf2375 +replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821145050-a30da83d09c4 replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230820165857-52ff32c4d8eb diff --git a/go.sum b/go.sum index faa23bb67..a755e5ca8 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821131943-b6162daf2375 h1:CRYTjbBZO1JH4KHJ1ISIOlL0lFuEMoKblVlACcjrK5s= -github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821131943-b6162daf2375/go.mod h1:cstHMVqu11rn4TadtCBHrcuL+KcJ94kjSmMQSWMB61I= +github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821145050-a30da83d09c4 h1:wylQBde6B6Bk4hjAww0kXkuBLjXPBfkDzTERFGoExvo= +github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821145050-a30da83d09c4/go.mod h1:cstHMVqu11rn4TadtCBHrcuL+KcJ94kjSmMQSWMB61I= github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ= github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= diff --git a/utils/config/config.go b/utils/config/config.go index 006f2dcee..76e667222 100644 --- a/utils/config/config.go +++ b/utils/config/config.go @@ -32,8 +32,6 @@ func init() { // This is the default server id. It is used when adding a server config without providing a server ID const ( DefaultServerId = "Default-Server" - - XscServiceAPI = "xsc" ) func IsServerConfExists() (bool, error) { @@ -565,6 +563,7 @@ func (o *ConfigV0) Convert() *ConfigV4 { type ServerDetails struct { Url string `json:"url,omitempty"` XscUrl string `json:"-"` + XscVersion string `json:"-"` SshUrl string `json:"-"` ArtifactoryUrl string `json:"artifactoryUrl,omitempty"` DistributionUrl string `json:"distributionUrl,omitempty"` @@ -587,7 +586,6 @@ type ServerDetails struct { IsDefault bool `json:"isDefault,omitempty"` InsecureTls bool `json:"-"` WebLogin bool `json:"webLogin,omitempty"` - XscVersion string } // Deprecated