From d2d440093d25530f520c3b70f087629c973dc885 Mon Sep 17 00:00:00 2001 From: Reshmi Date: Tue, 6 Jan 2026 10:18:43 +0530 Subject: [PATCH 1/4] update artifactory deps --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1e7f4f380..bd306b4b8 100644 --- a/go.mod +++ b/go.mod @@ -289,3 +289,5 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 //replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.54.2-0.20251007084958-5eeaa42c31a6 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security dev + +replace github.com/jfrog/jfrog-cli-artifactory => github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49 diff --git a/go.sum b/go.sum index 4619b1ffb..270cf577e 100644 --- a/go.sum +++ b/go.sum @@ -1216,8 +1216,6 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7 h1:UzFwA39ZTvinCbNvhr9QooeZaF1NBMkxXdBYJwTrXcU= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7/go.mod h1:T8BzK7jnojx74G/tFs6lTjvNjNO6ltdWaZmY0X0YOOI= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 h1:WTyDOaYJUwY6zQujZuL9JQ9Q9+QWj9p31tLb4bJnu4U= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251/go.mod h1:REkU0OfnLYZbQIjD2Cg85DAVP0SRZuV/PxiDfCJiJOc= github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug= @@ -1390,6 +1388,8 @@ github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnA github.com/redis/go-redis/v9 v9.14.1 h1:nDCrEiJmfOWhD76xlaw+HXT0c9hfNWeXgl0vIRYSDvQ= github.com/redis/go-redis/v9 v9.14.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49 h1:5ZJdabPPdgcpW4K9Im+S4sIjRzH1Df4HE3qsmarlE4U= +github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49/go.mod h1:RneaDbEkoOAAHs6mAVxK666EB8GrNaCyNwyS452vVd0= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= From dc60cd2ba377aa6f776bb09d3714838ae8b1dbc1 Mon Sep 17 00:00:00 2001 From: Reshmi Date: Wed, 7 Jan 2026 11:23:24 +0530 Subject: [PATCH 2/4] remove repalce statement --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2dcf67c32..8ae8c0504 100644 --- a/go.mod +++ b/go.mod @@ -294,4 +294,4 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security dev -replace github.com/jfrog/jfrog-cli-artifactory => github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49 +// replace github.com/jfrog/jfrog-cli-artifactory => github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49 diff --git a/go.sum b/go.sum index d72a9e660..bc94c100b 100644 --- a/go.sum +++ b/go.sum @@ -1216,6 +1216,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260106205551-4e8b57642da2 h1:O4Mi3JWTrwcs4j13O74QB15MwZOxOzCR3oCb7YOg1fE= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260106205551-4e8b57642da2/go.mod h1:hHPE/xl3blncGaUZ5RsK1eim63zpLg0V+yrLhgVsj28= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b h1:gGGmYXuYvcNns1BnLQI13lC+pgMxrmenx+ramtolQuA= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b/go.mod h1:+Hnaikp/xCSPD/q7txxRy4Zc0wzjW/usrCSf+6uONSQ= github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug= @@ -1388,8 +1390,6 @@ github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnA github.com/redis/go-redis/v9 v9.14.1 h1:nDCrEiJmfOWhD76xlaw+HXT0c9hfNWeXgl0vIRYSDvQ= github.com/redis/go-redis/v9 v9.14.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49 h1:5ZJdabPPdgcpW4K9Im+S4sIjRzH1Df4HE3qsmarlE4U= -github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49/go.mod h1:RneaDbEkoOAAHs6mAVxK666EB8GrNaCyNwyS452vVd0= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= From 9ef13a052a790fbeb5f19a3d374fab3aec8a55f1 Mon Sep 17 00:00:00 2001 From: reshmifrog Date: Wed, 7 Jan 2026 11:49:25 +0530 Subject: [PATCH 3/4] conan improvements (#3300) --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 8ae8c0504..a14f02074 100644 --- a/go.mod +++ b/go.mod @@ -293,5 +293,3 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 //replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.54.2-0.20251007084958-5eeaa42c31a6 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security dev - -// replace github.com/jfrog/jfrog-cli-artifactory => github.com/reshmifrog/jfrog-cli-artifactory v0.0.0-20260106044409-74d2e3837d49 From 8bcdf56ef34d78efbd4a9d755c00cf501b60e2e7 Mon Sep 17 00:00:00 2001 From: Reshmi Date: Wed, 7 Jan 2026 11:57:57 +0530 Subject: [PATCH 4/4] changed hidden to false for conan --- buildtools/cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/cli.go b/buildtools/cli.go index 63f44a2e3..d9d8c1bd8 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -359,7 +359,7 @@ func GetCommands() []cli.Command { }, { Name: "conan", - Hidden: true, + Hidden: false, Flags: cliutils.GetCommandFlags(cliutils.Conan), Usage: conan.GetDescription(), HelpName: corecommon.CreateUsage("conan", conan.GetDescription(), conan.Usage),