Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #2626

Merged
merged 26 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f728071
Fix npm script
sverdlov93 Jul 16, 2024
f710a2d
Fix npm script
sverdlov93 Jul 16, 2024
a650345
unite actions
sverdlov93 Jul 16, 2024
0b06f0a
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into unit-ac…
sverdlov93 Jul 16, 2024
0c2f5e7
unite actions
sverdlov93 Jul 16, 2024
6f58e32
unite actions
sverdlov93 Jul 16, 2024
bc0c1ed
unite actions
sverdlov93 Jul 21, 2024
8277459
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into unit-ac…
sverdlov93 Jul 24, 2024
4039b61
unite actions
sverdlov93 Jul 24, 2024
4e9c013
Merge branch 'dev' into unit-actions
sverdlov93 Jul 24, 2024
be73784
Merge branch 'dev' into unit-actions
sverdlov93 Jul 24, 2024
26c4f3c
Merge branch 'dev' into unit-actions
sverdlov93 Jul 24, 2024
7fbd580
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into unit-ac…
sverdlov93 Jul 24, 2024
edaa839
unite actions
sverdlov93 Jul 24, 2024
2ccc418
Merge remote-tracking branch 'sverdlov93/unit-actions' into unit-actions
sverdlov93 Jul 24, 2024
88d82b3
unite actions
sverdlov93 Jul 24, 2024
6a98229
improve
sverdlov93 Jul 25, 2024
8bdf46c
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into unit-ac…
sverdlov93 Jul 25, 2024
8b833d8
improve
sverdlov93 Jul 25, 2024
4f1bd88
improve
sverdlov93 Jul 25, 2024
37a8cb6
revert minsplitsize
sverdlov93 Jul 29, 2024
cf5ebf5
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into unit-ac…
sverdlov93 Jul 29, 2024
6fab51c
revert minsplitsize
sverdlov93 Jul 29, 2024
9e0f589
revert minsplitsize
sverdlov93 Jul 29, 2024
45a3c2f
revert minsplitsize
sverdlov93 Jul 29, 2024
5357b53
revert minsplitsize
sverdlov93 Jul 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
github.com/jfrog/archiver/v3 v3.6.1
github.com/jfrog/build-info-go v1.9.30
github.com/jfrog/gofrog v1.7.4
github.com/jfrog/gofrog v1.7.5
github.com/jfrog/jfrog-cli-artifactory v0.1.1
github.com/jfrog/jfrog-cli-core/v2 v2.53.4
github.com/jfrog/jfrog-cli-platform-services v1.3.0
Expand Down Expand Up @@ -170,11 +170,13 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595

replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40

// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756

replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6

// replace github.com/jfrog/build-info-go => github.com/eyalbe4/build-info-go v1.8.9-0.20240723132035-980d2c84b738

Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -936,24 +936,24 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+
github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
github.com/jfrog/build-info-go v1.9.30 h1:RmK3NuDGUoyCjCNJJBlHaCm4vWzO8BLjkuAkMzj6PGE=
github.com/jfrog/build-info-go v1.9.30/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg=
github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 h1:xyZEZDZvg/sLS5PH5b8zFnj6b2XBW4aYHXey0sv+F9I=
github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg=
github.com/jfrog/froggit-go v1.16.1 h1:FBIM1qevX/ag9unfmpGzfmZ36D8ulOJ+DPTSFUk3l5U=
github.com/jfrog/froggit-go v1.16.1/go.mod h1:TEJSzgiV+3D/GVGE8Y6j46ut1jrBLD1FL6WdMdKwwCE=
github.com/jfrog/gofrog v1.7.4 h1:on4AeWef5LJUhGCigSjTS4Ez3n9l8+NiZlXH6UYp05c=
github.com/jfrog/gofrog v1.7.4/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298=
github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg=
github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298=
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
github.com/jfrog/jfrog-cli-artifactory v0.1.1 h1:3HfowB29TBEtr6BgAezdqTRVFhBFa5XasxARLh+1HDE=
github.com/jfrog/jfrog-cli-artifactory v0.1.1/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 h1:BBbrrW0dm0kDkIM3BS9AVvvLmw/dJbiiSh5/vQJK9v0=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54/go.mod h1:qF+g5F4ImRlyCYoFbeWtksaDGhneQSB27t2/6/H89Hc=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 h1:jOCvoCoWaUZTJK4SkgamSCUgA6U5E4YWV6scS9U0Z2c=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595/go.mod h1:h1IMa3Fp1pqn37HJTimnMDoxcVlTpWiO7hC3dd9tNdE=
github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA=
github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc=
github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ=
github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA=
github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 h1:jCfJV5FXOIclSGhRbrTNNFteF27CSb+etW246mewVAk=
github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4=
github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 h1:U61knfgV/WZ4ZOhEEKKlnXQ8Y1BlKVPyVjTaERymIk0=
github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6/go.mod h1:0m+jdJgsLF2QHl4f/t9JHuJ9E0Oqf9kK24UWsjAtvsE=
github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 h1:zmh1NwYtbS3GE7jCPWtQpGsTakMo5DHl73BRkZTn6Ag=
github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40/go.mod h1:BJqDxNVbs34kuCx9ct6ge3/M39Pf/m5L5IYgZ9p8ap4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI=
Expand Down
2 changes: 1 addition & 1 deletion utils/cliutils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func CreateBuildInfoSummaryReportString(success, failed int, sha256 string, err

func CreateDownloadConfiguration(c *cli.Context) (downloadConfiguration *artifactoryUtils.DownloadConfiguration, err error) {
downloadConfiguration = new(artifactoryUtils.DownloadConfiguration)
downloadConfiguration.MinSplitSizeKb, err = getMinSplit(c, DownloadMinSplitKb)
downloadConfiguration.MinSplitSize, err = getMinSplit(c, DownloadMinSplitKb)
if err != nil {
return nil, err
}
Expand Down
Loading