Skip to content

Commit c9b570a

Browse files
Merge remote-tracking branch 'origin/dev' into v2
2 parents 72b5181 + 7203d44 commit c9b570a

9 files changed

Lines changed: 773 additions & 26 deletions

File tree

artifactory/cli.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,6 +1254,7 @@ func createDefaultDeleteSpec(c *cli.Context) (*spec.SpecFiles, error) {
12541254
Recursive(c.BoolT("recursive")).
12551255
Exclusions(cliutils.GetStringsArrFlagValue(c, "exclusions")).
12561256
ArchiveEntries(c.String("archive-entries")).
1257+
RepoOnly(c.Bool("repo-only")).
12571258
BuildSpec(), nil
12581259
}
12591260

build/npm/v2-jf/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2-jf/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2-jf",
3-
"version": "2.78.0",
3+
"version": "2.78.1",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

build/npm/v2/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2",
3-
"version": "2.78.0",
3+
"version": "2.78.1",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

go.mod

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ require (
1818
github.com/jfrog/archiver/v3 v3.6.1
1919
github.com/jfrog/build-info-go v1.10.14
2020
github.com/jfrog/gofrog v1.7.6
21-
github.com/jfrog/jfrog-cli-artifactory v0.4.0
22-
github.com/jfrog/jfrog-cli-core/v2 v2.59.2
21+
github.com/jfrog/jfrog-cli-artifactory v0.5.1
22+
github.com/jfrog/jfrog-cli-core/v2 v2.59.3
2323
github.com/jfrog/jfrog-cli-platform-services v1.10.0
24-
github.com/jfrog/jfrog-cli-security v1.20.0
25-
github.com/jfrog/jfrog-client-go v1.54.2
24+
github.com/jfrog/jfrog-cli-security v1.20.2
25+
github.com/jfrog/jfrog-client-go v1.54.3
2626
github.com/jszwec/csvutil v1.10.0
2727
github.com/manifoldco/promptui v0.9.0
2828
github.com/stretchr/testify v1.10.0
@@ -91,7 +91,7 @@ require (
9191
github.com/go-openapi/strfmt v0.23.0 // indirect
9292
github.com/go-openapi/swag v0.23.1 // indirect
9393
github.com/go-openapi/validate v0.24.0 // indirect
94-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
94+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
9595
github.com/gogo/protobuf v1.3.2 // indirect
9696
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
9797
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
@@ -100,6 +100,7 @@ require (
100100
github.com/google/certificate-transparency-go v1.3.1 // indirect
101101
github.com/google/go-containerregistry v0.20.3 // indirect
102102
github.com/google/go-github/v56 v56.0.0 // indirect
103+
github.com/google/go-github/v62 v62.0.0 // indirect
103104
github.com/google/go-querystring v1.1.0 // indirect
104105
github.com/google/gofuzz v1.2.0 // indirect
105106
github.com/google/uuid v1.6.0 // indirect
@@ -117,7 +118,7 @@ require (
117118
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
118119
github.com/jedib0t/go-pretty/v6 v6.6.5 // indirect
119120
github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b // indirect
120-
github.com/jfrog/froggit-go v1.18.0 // indirect
121+
github.com/jfrog/froggit-go v1.20.0 // indirect
121122
github.com/jfrog/go-mockhttp v0.3.1 // indirect
122123
github.com/jfrog/jfrog-apps-config v1.0.1 // indirect
123124
github.com/josharian/intern v1.0.0 // indirect
@@ -242,10 +243,10 @@ require (
242243

243244
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250529104758-6d769a684388
244245

245-
replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.4.1-0.20250717082417-55c8609c3397
246+
// replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.4.1-0.20250718083259-4a60768eb51b
246247

247-
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250717045550-6e019038f578
248+
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250717045550-6e019038f578
248249

249-
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250717041744-d3ea4d99f4e7
250+
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250717041744-d3ea4d99f4e7
250251

251252
//replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.17.2-0.20250511132918-d9cc4cd50020

go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
234234
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
235235
github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
236236
github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
237-
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
238-
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
237+
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
238+
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
239239
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 h1:FWNFq4fM1wPfcK40yHE5UO3RUdSNPaBC+j3PokzA6OQ=
240240
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=
241241
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
@@ -266,6 +266,8 @@ github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM
266266
github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
267267
github.com/google/go-github/v56 v56.0.0 h1:TysL7dMa/r7wsQi44BjqlwaHvwlFlqkK8CtBWCX3gb4=
268268
github.com/google/go-github/v56 v56.0.0/go.mod h1:D8cdcX98YWJvi7TLo7zM4/h8ZTx6u6fwGEkCdisopo0=
269+
github.com/google/go-github/v62 v62.0.0 h1:/6mGCaRywZz9MuHyw9gD1CwsbmBX8GWsbFkwMmHdhl4=
270+
github.com/google/go-github/v62 v62.0.0/go.mod h1:EMxeUqGJq2xRu9DYBMwel/mr7kZrzUOfQmmpYrZn2a4=
269271
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
270272
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
271273
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -352,24 +354,24 @@ github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5
352354
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
353355
github.com/jfrog/build-info-go v1.10.14 h1:PWnw+rBwiQTHZ5q+84+E8MHFjtAQkB3+Oc2sKwBSSGE=
354356
github.com/jfrog/build-info-go v1.10.14/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
355-
github.com/jfrog/froggit-go v1.18.0 h1:1tm3Q6Qc+dSPgzpGyBXfxBPFuX6L9pk6eENdF7RQq+Y=
356-
github.com/jfrog/froggit-go v1.18.0/go.mod h1:SE3jF0+XRKNuC1a6CzHxtU5nBRnyKg1jzDjUXxqu92g=
357+
github.com/jfrog/froggit-go v1.20.0 h1:8HglCC9Mew8OOrveYOWR08ISgOcyeNzwpWVFWyLHwVA=
358+
github.com/jfrog/froggit-go v1.20.0/go.mod h1:KBZnlDV448g1nb9I38WLtEu5SAqUFhTegvChYKIn/KU=
357359
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
358360
github.com/jfrog/go-mockhttp v0.3.1/go.mod h1:LmKHex73SUZswM8ANS8kPxLihTOvtq44HVcCoTJKuqc=
359361
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
360362
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
361363
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
362364
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
363-
github.com/jfrog/jfrog-cli-artifactory v0.4.1-0.20250717082417-55c8609c3397 h1:5KIcR4d6rZqTpMP/xklyYuld3HGpzZHEliLIKWAJur0=
364-
github.com/jfrog/jfrog-cli-artifactory v0.4.1-0.20250717082417-55c8609c3397/go.mod h1:QwpO2tlDe/Aaz/xIGMZSOIFAzZDsMA+5aPIvy+zlRkY=
365-
github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250717045550-6e019038f578 h1:xYM1jGiUQYotokFRtLqoKwxtI0+XisXrP5rrBFVU2FM=
366-
github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250717045550-6e019038f578/go.mod h1:Jz0ZQqrarcryOo+v1IvVujPCtNZH/UHiDjb/FJkPjmA=
365+
github.com/jfrog/jfrog-cli-artifactory v0.5.1 h1:C1H8x6ldg7VmKIb4F8OZKm0PJbBrlA73y2tmoy/s9m8=
366+
github.com/jfrog/jfrog-cli-artifactory v0.5.1/go.mod h1:RXz0AZ5qVEOhanXRGmC4+atqr29ZtIeV5kUCbNGtVj4=
367+
github.com/jfrog/jfrog-cli-core/v2 v2.59.3 h1:AlFC9l3Cwvx2FzuAP0txxEjZPDjv5bpO7YPTOjHp7HA=
368+
github.com/jfrog/jfrog-cli-core/v2 v2.59.3/go.mod h1:Itfva9wqPMkUVBuNpKw0Oe4qoPlt0PdXfmWqf7fBebU=
367369
github.com/jfrog/jfrog-cli-platform-services v1.10.0 h1:O+N/VAF+QjFvq9xkHpmzKLcdl9aJu3IP204Su0L14rw=
368370
github.com/jfrog/jfrog-cli-platform-services v1.10.0/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok=
369-
github.com/jfrog/jfrog-cli-security v1.20.0 h1:6vP7HPXNSZNzP0BSLDvh8klTJOPuLDxjwdpL9zdMIdE=
370-
github.com/jfrog/jfrog-cli-security v1.20.0/go.mod h1:hqnnxuPTeUFDWp8W7ESmL8odhTAFoF9jyb9niLumAMo=
371-
github.com/jfrog/jfrog-client-go v1.28.1-0.20250717041744-d3ea4d99f4e7 h1:IHClKKEHPZMR1UWTTVYjqf3asYrCuEq1wd4lI/ASHRQ=
372-
github.com/jfrog/jfrog-client-go v1.28.1-0.20250717041744-d3ea4d99f4e7/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
371+
github.com/jfrog/jfrog-cli-security v1.20.2 h1:GGpSdEnxcmUbK5Iinm8LN0EUG9KAm1+K958yYtcqxeQ=
372+
github.com/jfrog/jfrog-cli-security v1.20.2/go.mod h1:3sDIo2prTKwB2IeiWk7Hqxxags8obqRi5uNnh9i9XIc=
373+
github.com/jfrog/jfrog-client-go v1.54.3 h1:tIhhDhM7rDMT1lzgeQy4nr6H2ihlqnumhiFybIWlLz0=
374+
github.com/jfrog/jfrog-client-go v1.54.3/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
373375
github.com/jhump/protoreflect v1.16.0 h1:54fZg+49widqXYQ0b+usAFHbMkBGR4PpXrsHc8+TBDg=
374376
github.com/jhump/protoreflect v1.16.0/go.mod h1:oYPd7nPvcBw/5wlDfm/AVmU9zH9BgqGCI469pGxfj/8=
375377
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY=

0 commit comments

Comments
 (0)