Skip to content

Commit c1c3545

Browse files
committed
Updated the merge logic and added more tests
1 parent fa3c984 commit c1c3545

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1
286286

287287
// replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20260105073552-ae4f86048a11
288288
//
289-
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba
289+
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.13.1-0.20260130120139-9d76cc0ef9a1
290290

291291
//replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.58.1-0.20260105065921-c6488910f44c
292292

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,8 +1204,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
12041204
github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
12051205
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
12061206
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
1207-
github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba h1:lqQ11uedpLeEbAOmDqZkaBrQG06jB5fr7US22uiLitw=
1208-
github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
1207+
github.com/jfrog/build-info-go v1.13.1-0.20260130120139-9d76cc0ef9a1 h1:RFcai9IV9uwXGpoAN3CuQDORlK/F69umlLwxWJigZhI=
1208+
github.com/jfrog/build-info-go v1.13.1-0.20260130120139-9d76cc0ef9a1/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
12091209
github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
12101210
github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
12111211
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=

0 commit comments

Comments
 (0)