From cb97009db7ced6a3196b84b5d960a9b84bd02b87 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 20 May 2026 14:22:09 +0200 Subject: [PATCH 1/2] Bump version to 2.104.1 --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- utils/cliutils/cli_consts.go | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index 0e98af85b..73e46d525 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.104.0", + "version": "2.104.1", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index df8b9300b..bd84f8d38 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.104.0", + "version": "2.104.1", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index 6603da53e..24e5d4e65 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.104.0", + "version": "2.104.1", "lockfileVersion": 2 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index 7888c5a15..fca3ab185 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.104.0", + "version": "2.104.1", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/go.mod b/go.mod index d3f63219c..1c317b2df 100644 --- a/go.mod +++ b/go.mod @@ -16,15 +16,15 @@ require ( github.com/docker/docker v28.5.2+incompatible github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.3 - github.com/jfrog/build-info-go v1.13.1-0.20260514141440-b2463b51dc3a + github.com/jfrog/build-info-go v1.13.1-0.20260519074839-e2d81022f459 github.com/jfrog/gofrog v1.7.6 github.com/jfrog/jfrog-cli-application v1.0.2-0.20260511133105-55a0ab56fd64 github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260515045427-eb0cec44a4e2 - github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260519061857-676e48fbefcd + github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260519160146-908527b450ff github.com/jfrog/jfrog-cli-evidence v0.9.4 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20260430094150-ce7d9b371c6f github.com/jfrog/jfrog-cli-security v1.29.0 - github.com/jfrog/jfrog-client-go v1.55.1-0.20260508101905-a17af78a38d7 + github.com/jfrog/jfrog-client-go v1.55.1-0.20260518073856-78c118beaa69 github.com/jszwec/csvutil v1.10.0 github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.11.1 @@ -85,7 +85,7 @@ require ( github.com/gfleury/go-bitbucket-v1 v0.0.0-20240917142304-df385efaac68 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.9.0 // indirect - github.com/go-git/go-git/v5 v5.19.0 // indirect + github.com/go-git/go-git/v5 v5.19.1 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect diff --git a/go.sum b/go.sum index 95a4f6772..ccc99a144 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmm github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.19.0 h1:+WkVUQZSy/F1Gb13udrMKjIM2PrzsNfDKFSfo5tkMtc= -github.com/go-git/go-git/v5 v5.19.0/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ= +github.com/go-git/go-git/v5 v5.19.1 h1:nX27AnaU43/K5bKktKwgBmR9lawoYVe1Ckg0rgzzN00= +github.com/go-git/go-git/v5 v5.19.1/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ= github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA= github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -406,8 +406,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4= github.com/jfrog/archiver/v3 v3.6.3 h1:hkAmPjBw393tPmQ07JknLNWFNZjXdy2xFEnOW9wwOxI= github.com/jfrog/archiver/v3 v3.6.3/go.mod h1:5V9l+Fte30Y4qe9dUOAd3yNTf8lmtVNuhKNrvI8PMhg= -github.com/jfrog/build-info-go v1.13.1-0.20260514141440-b2463b51dc3a h1:+TOYHOux+EIkmJUcZvcpWcMjhwkEo0EyIkepEcAxJX8= -github.com/jfrog/build-info-go v1.13.1-0.20260514141440-b2463b51dc3a/go.mod h1:CYRUCvLKfyARjoJXLWAxce1qNUxTEtbRKAARkV42vpE= +github.com/jfrog/build-info-go v1.13.1-0.20260519074839-e2d81022f459 h1:tlqz9iKWaachSMvHQtGediH8dqWBKGXlDDCXtY9QfGM= +github.com/jfrog/build-info-go v1.13.1-0.20260519074839-e2d81022f459/go.mod h1:CYRUCvLKfyARjoJXLWAxce1qNUxTEtbRKAARkV42vpE= github.com/jfrog/froggit-go v1.22.0 h1:eeN5F8sOUo+h2cXkzArAu4nvSdjkDTAZtgqwrct70qg= github.com/jfrog/froggit-go v1.22.0/go.mod h1:wRDryqyp3oe+eHgME2mpnEQmO8XBECIPagFwj0nHmdI= github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8= @@ -420,16 +420,16 @@ github.com/jfrog/jfrog-cli-application v1.0.2-0.20260511133105-55a0ab56fd64 h1:b github.com/jfrog/jfrog-cli-application v1.0.2-0.20260511133105-55a0ab56fd64/go.mod h1:cKqb/JgN+XuD4RhOxvSZnyGyXw3cJsTZfQT3rk9MCho= github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260515045427-eb0cec44a4e2 h1:1nCyNPDxH2EXUz0zx2bFBViYrW/KoqGcQDH9Jm8HHs8= github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260515045427-eb0cec44a4e2/go.mod h1:XESHQN9MEeje13fJaXtbljidwTqlJO+qhhUHHDxwntQ= -github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260519061857-676e48fbefcd h1:R7wPNFOAFfPDb8ZQPw3hJcbaPIGsi325fZaLoWwGTGg= -github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260519061857-676e48fbefcd/go.mod h1:bh1ptuSLGZT4l51hl+xgUlS7sAd8K77tKn0wa5n7TQo= +github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260519160146-908527b450ff h1:SrtP+sdTSZjbjLDQ4XVtWCM11Ao+Hrj8OADtR+K2eCQ= +github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260519160146-908527b450ff/go.mod h1:D9afcOJmauUYcQZ3WGDg7HejyoBmCQr2XrwXHeN1YY8= github.com/jfrog/jfrog-cli-evidence v0.9.4 h1:RAqZYaH2RrzmhW+bGA7dx/yTqa4X1fZ4/5V7VVMSJtc= github.com/jfrog/jfrog-cli-evidence v0.9.4/go.mod h1:nLSLqLIhQz1Hi2n+KjHZTyK1mcmPLevv41LjItLswmE= github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20260430094150-ce7d9b371c6f h1:M1cesbKYSznwPA76dNctjCELxGx34TSSjwoYnJm9/6Y= github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20260430094150-ce7d9b371c6f/go.mod h1:JUdq/dQoNscpta62FDCAcaSVbvcCOr5VkH8UeGTG1HQ= github.com/jfrog/jfrog-cli-security v1.29.0 h1:TN2OCA5i/iPbikQWzSwVqGvySvIvw1P6rPga+DbVBOI= github.com/jfrog/jfrog-cli-security v1.29.0/go.mod h1:q38TPlxortIJvbyD3u9P9UhHwyx007tEb9WbXlXw2E0= -github.com/jfrog/jfrog-client-go v1.55.1-0.20260508101905-a17af78a38d7 h1:o8fk4yWLqNMldarXyh/4NbmdbYbuM+lKYobdJK7shqM= -github.com/jfrog/jfrog-client-go v1.55.1-0.20260508101905-a17af78a38d7/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U= +github.com/jfrog/jfrog-client-go v1.55.1-0.20260518073856-78c118beaa69 h1:ARMrNOd2lp3LjjnH7h1xzaHarrutEUrH4VUF84R/dJE= +github.com/jfrog/jfrog-client-go v1.55.1-0.20260518073856-78c118beaa69/go.mod h1:k3PqoFpS6XDt9/4xg3pS8J8JUvxtaz1w2vdTdodknGk= github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94= github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8= github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY= diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index 1e2bda216..c709e53ba 100644 --- a/utils/cliutils/cli_consts.go +++ b/utils/cliutils/cli_consts.go @@ -4,7 +4,7 @@ import "time" const ( // General CLI constants - CliVersion = "2.104.0" + CliVersion = "2.104.1" ClientAgent = "jfrog-cli-go" // CLI base commands constants: From b022bde029023810a45f013a663e94116a93bd7e Mon Sep 17 00:00:00 2001 From: ehl-jf Date: Wed, 20 May 2026 15:51:13 +0200 Subject: [PATCH 2/2] JGC-493 - Skip flaky NuGet/Dotnet resolve tests --- nuget_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nuget_test.go b/nuget_test.go index 838b8998e..796e0992d 100644 --- a/nuget_test.go +++ b/nuget_test.go @@ -72,6 +72,22 @@ func TestDotnetResolve(t *testing.T) { testNativeNugetDotnetResolve(t, uniqueDotnetTests, tests.DotnetBuildName, project.Dotnet) } +// jgc493SkippedResolveTests lists TestNugetResolve / TestDotnetResolve +// subtests that intermittently miss bootstrap's transitive deps (popper.js, +// jQuery) when nuget.exe under Mono caches an incomplete registration +// response from Artifactory's NuGet remote. Skipped until JGC-493 is fixed. +var jgc493SkippedResolveTests = map[string]bool{ + "referencewithoutmodulechange": true, + "referencewithmodulechange": true, + "multireferencewithoutmodulechange": true, + "multireferencewithmodulechange": true, + "multireferencewithslnpath": true, + "multireferencewithslndir": true, + "sln_and_proj_different_locations": true, + "dotnetargswithspaces": true, + "multireferencesingleprojectdir": true, +} + func testNativeNugetDotnetResolve(t *testing.T, uniqueTests []testDescriptor, buildName string, projectType project.ProjectType) { initNugetTest(t) testDescriptors := append(slices.Clone(uniqueTests), []testDescriptor{ @@ -92,6 +108,9 @@ func testNativeNugetDotnetResolve(t *testing.T, uniqueTests []testDescriptor, bu return } t.Run(test.name, func(t *testing.T) { + if jgc493SkippedResolveTests[test.name] { + t.Skip("JGC-493 - Skip until fixed") + } testNugetCmd(t, projectPath, buildName, strconv.Itoa(buildNumber), test.expectedModules, test.args, test.expectedDependencies) }) }