Skip to content

Commit efa5339

Browse files
authored
Merge branch 'dev' into feature/XRAY-156682-yarn-native
2 parents 95b8588 + a2d5b78 commit efa5339

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

git_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ func TestGitAuditJasSkipNotApplicableCvesViolations(t *testing.T) {
308308
xrayVersion, xscVersion, "",
309309
validations.ValidationParams{
310310
Violations: &validations.ViolationCount{
311-
ValidateScan: &validations.ScanCount{Sca: 70, Sast: 5, Secrets: 2},
312-
ValidateApplicabilityStatus: &validations.ApplicabilityStatusCount{NotApplicable: 61, NotCovered: 8, MissingContext: 1, Inactive: 1},
311+
ValidateScan: &validations.ScanCount{Sca: 72, Sast: 5, Secrets: 2},
312+
ValidateApplicabilityStatus: &validations.ApplicabilityStatusCount{NotApplicable: 61, NotCovered: 10, MissingContext: 1, Inactive: 1},
313313
},
314314
ExactResultsMatch: true,
315315
},
@@ -343,8 +343,8 @@ func TestGitAuditJasSkipNotApplicableCvesViolations(t *testing.T) {
343343
xrayVersion, xscVersion, "",
344344
validations.ValidationParams{
345345
Violations: &validations.ViolationCount{
346-
ValidateScan: &validations.ScanCount{Sca: 9, Sast: 5, Secrets: 2},
347-
ValidateApplicabilityStatus: &validations.ApplicabilityStatusCount{NotCovered: 8, MissingContext: 1, Inactive: 1},
346+
ValidateScan: &validations.ScanCount{Sca: 11, Sast: 5, Secrets: 2},
347+
ValidateApplicabilityStatus: &validations.ApplicabilityStatusCount{NotCovered: 10, MissingContext: 1, Inactive: 1},
348348
},
349349
ExactResultsMatch: true,
350350
},

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ require (
1414
github.com/gookit/color v1.6.1
1515
github.com/hashicorp/go-hclog v1.6.3
1616
github.com/hashicorp/go-plugin v1.6.3
17-
github.com/jfrog/build-info-go v1.13.1-0.20260811071930-3b99d4a6c84b
17+
github.com/jfrog/build-info-go v1.13.1-0.20260818195724-23e528d30b96
1818
github.com/jfrog/froggit-go v1.23.1
1919
github.com/jfrog/gofrog v1.7.6
2020
github.com/jfrog/jfrog-apps-config v1.0.1
21-
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260816162502-d13e3b54f42a
21+
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260819070735-a590327f2489
2222
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260814125750-77deb9f6259c
2323
github.com/jfrog/jfrog-client-go v1.55.1-0.20260813100550-0f2168d02558
2424
github.com/magiconair/properties v1.18.11

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,16 @@ github.com/jedib0t/go-pretty/v6 v6.8.3 h1:yVSk5aemoYHCvcrtqyXklwqcgHQIQzmy/oUzFl
161161
github.com/jedib0t/go-pretty/v6 v6.8.3/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
162162
github.com/jfrog/archiver/v3 v3.6.4 h1:qHAWCLKwo3+ocHNNoWzGZ8ESl8QQk/lR3W09Pt+ROvE=
163163
github.com/jfrog/archiver/v3 v3.6.4/go.mod h1:5V9l+Fte30Y4qe9dUOAd3yNTf8lmtVNuhKNrvI8PMhg=
164-
github.com/jfrog/build-info-go v1.13.1-0.20260811071930-3b99d4a6c84b h1:2AdobqXAdCICOEpabSc0yJavJOtX1W14/6Le8ervBaQ=
165-
github.com/jfrog/build-info-go v1.13.1-0.20260811071930-3b99d4a6c84b/go.mod h1:CYRUCvLKfyARjoJXLWAxce1qNUxTEtbRKAARkV42vpE=
164+
github.com/jfrog/build-info-go v1.13.1-0.20260818195724-23e528d30b96 h1:aVT0+x1sn1PW7piZhqErCHnikcwdBQqDyzvvgmin7Bc=
165+
github.com/jfrog/build-info-go v1.13.1-0.20260818195724-23e528d30b96/go.mod h1:CYRUCvLKfyARjoJXLWAxce1qNUxTEtbRKAARkV42vpE=
166166
github.com/jfrog/froggit-go v1.23.1 h1:4wmaHeuptxVINbovMaeITzVhi3+VQoc/FFIjF4axzu0=
167167
github.com/jfrog/froggit-go v1.23.1/go.mod h1:wRDryqyp3oe+eHgME2mpnEQmO8XBECIPagFwj0nHmdI=
168168
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
169169
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
170170
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
171171
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
172-
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260816162502-d13e3b54f42a h1:yjP7YAAmoxgyZ4NXh6IDkStTs+SnFeRtBJR+g8OJbr4=
173-
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260816162502-d13e3b54f42a/go.mod h1:eYyYY+GMdddy75/rCWiKg8EydGp/jRY+9+30QkGpbGw=
172+
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260819070735-a590327f2489 h1:FxdCh8hxWuboF+q6okuJimF96aTFNSTXlIi0Blwp3Uo=
173+
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260819070735-a590327f2489/go.mod h1:1ACZmkzA38Si48i9f052M4BDLfti02lHUfL/f853Ny0=
174174
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260814125750-77deb9f6259c h1:H77lybOSbPe2T70+l0Q9zy7eXWLbLj4ph2R2Svahf5A=
175175
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260814125750-77deb9f6259c/go.mod h1:gf7aUg/G9JyltCNhwMD5RVEsFzUCKPWKXRcTXSqMYBk=
176176
github.com/jfrog/jfrog-client-go v1.55.1-0.20260813100550-0f2168d02558 h1:/4ayHXxzgyZ9f66EqImCyZr2SKUpygU1P36sDVAlskM=

0 commit comments

Comments
 (0)