From 712fdf32f0c904d9a07ad5f8835a428f50b097c6 Mon Sep 17 00:00:00 2001 From: delarea Date: Thu, 13 Feb 2025 11:43:32 +0200 Subject: [PATCH 1/2] fix import --- go.mod | 9 ++------- go.sum | 12 ++++++------ main.go | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index a3562ad18..84f13a0c3 100644 --- a/go.mod +++ b/go.mod @@ -189,14 +189,9 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -//replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9 -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250212021126-e5223ab616af +//replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.15.0 -replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.1.13-0.20250212084027-746cc7ae6a63 - -replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.15.0 - -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250205140905-08198f526976 +//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250205140905-08198f526976 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20241220065541-91828d43d8b9 diff --git a/go.sum b/go.sum index a3a6467bf..87b119599 100644 --- a/go.sum +++ b/go.sum @@ -185,16 +185,16 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= 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.13-0.20250212084027-746cc7ae6a63 h1:OaDd/sz00/89jzrrTnCePnjFj0qzPUy5INXSEyR/3Zg= -github.com/jfrog/jfrog-cli-artifactory v0.1.13-0.20250212084027-746cc7ae6a63/go.mod h1:llrtIDDeRoO0MmyT9shlBA74rTlaU0aJYS9JXj72F2Q= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250212021126-e5223ab616af h1:XnyhhyARP1YCzYGdhk8ovpyZV+hSchiTGVTuejrZXsI= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250212021126-e5223ab616af/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g= +github.com/jfrog/jfrog-cli-artifactory v0.1.12 h1:Nj6D1605/rr097LVQGZjJL4xOFEdATu6O+PIyg/f9T0= +github.com/jfrog/jfrog-cli-artifactory v0.1.12/go.mod h1:7wqnff7YstYHJbe/T3lKj+fJ5GxImlTjJp8nSZGcYm4= +github.com/jfrog/jfrog-cli-core/v2 v2.58.0 h1:tPjwJdWNv9PTz1ma5TjrMd9Uu0btcQg8eBCpc5h/rn4= +github.com/jfrog/jfrog-cli-core/v2 v2.58.0/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g= github.com/jfrog/jfrog-cli-platform-services v1.7.0 h1:u0AOyG4JX3VT7xhEeA9gDpBgW8tYILONpQURtzR3FkI= github.com/jfrog/jfrog-cli-platform-services v1.7.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= github.com/jfrog/jfrog-cli-security v1.15.0 h1:TYNIID231X/AivYtptDCF25JyH8qTQht6ISHRfwejL8= github.com/jfrog/jfrog-cli-security v1.15.0/go.mod h1:WyXj2D0zBfF6gbdufgt/DWGTA0Qr2dyRMwIqr21t0bc= -github.com/jfrog/jfrog-client-go v1.28.1-0.20250205140905-08198f526976 h1:C0TEnU8f6HhkeW+WHfWDtgHYLneKAaU/aqXCCDGEim8= -github.com/jfrog/jfrog-client-go v1.28.1-0.20250205140905-08198f526976/go.mod h1:xHxwKBjPSUBd/FyCWgusfHmSWKUZTkfOZkTmntC2F5Y= +github.com/jfrog/jfrog-client-go v1.50.0 h1:t7v/zpLkPomHR6ZjVbPQ1WPQJd9IFKESK9Tt6phZz3k= +github.com/jfrog/jfrog-client-go v1.50.0/go.mod h1:xHxwKBjPSUBd/FyCWgusfHmSWKUZTkfOZkTmntC2F5Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= diff --git a/main.go b/main.go index 1001d880a..b55d9c328 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "fmt" "github.com/agnivade/levenshtein" - artifactoryCLI "github.com/jfrog/jfrog-cli-artifactory/cli" + artifactoryCLI "github.com/jfrog/jfrog-cli-artifactory/evidence/cli" corecommon "github.com/jfrog/jfrog-cli-core/v2/docs/common" "github.com/jfrog/jfrog-cli-core/v2/plugins/components" coreconfig "github.com/jfrog/jfrog-cli-core/v2/utils/config" From d92013eb79d05834f0c0cda0ed4b28125a2864f0 Mon Sep 17 00:00:00 2001 From: delarea Date: Thu, 13 Feb 2025 12:53:03 +0200 Subject: [PATCH 2/2] Add replaces --- go.mod | 4 +++- go.sum | 8 ++++---- main.go | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 84f13a0c3..6d05aa279 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,9 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -//replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.15.0 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.1.13-0.20250212084027-746cc7ae6a63 + +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250212021126-e5223ab616af //replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250205140905-08198f526976 diff --git a/go.sum b/go.sum index 87b119599..abaeff7a1 100644 --- a/go.sum +++ b/go.sum @@ -185,10 +185,10 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= 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.12 h1:Nj6D1605/rr097LVQGZjJL4xOFEdATu6O+PIyg/f9T0= -github.com/jfrog/jfrog-cli-artifactory v0.1.12/go.mod h1:7wqnff7YstYHJbe/T3lKj+fJ5GxImlTjJp8nSZGcYm4= -github.com/jfrog/jfrog-cli-core/v2 v2.58.0 h1:tPjwJdWNv9PTz1ma5TjrMd9Uu0btcQg8eBCpc5h/rn4= -github.com/jfrog/jfrog-cli-core/v2 v2.58.0/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g= +github.com/jfrog/jfrog-cli-artifactory v0.1.13-0.20250212084027-746cc7ae6a63 h1:OaDd/sz00/89jzrrTnCePnjFj0qzPUy5INXSEyR/3Zg= +github.com/jfrog/jfrog-cli-artifactory v0.1.13-0.20250212084027-746cc7ae6a63/go.mod h1:llrtIDDeRoO0MmyT9shlBA74rTlaU0aJYS9JXj72F2Q= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250212021126-e5223ab616af h1:XnyhhyARP1YCzYGdhk8ovpyZV+hSchiTGVTuejrZXsI= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250212021126-e5223ab616af/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g= github.com/jfrog/jfrog-cli-platform-services v1.7.0 h1:u0AOyG4JX3VT7xhEeA9gDpBgW8tYILONpQURtzR3FkI= github.com/jfrog/jfrog-cli-platform-services v1.7.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= github.com/jfrog/jfrog-cli-security v1.15.0 h1:TYNIID231X/AivYtptDCF25JyH8qTQht6ISHRfwejL8= diff --git a/main.go b/main.go index b55d9c328..1001d880a 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "fmt" "github.com/agnivade/levenshtein" - artifactoryCLI "github.com/jfrog/jfrog-cli-artifactory/evidence/cli" + artifactoryCLI "github.com/jfrog/jfrog-cli-artifactory/cli" corecommon "github.com/jfrog/jfrog-cli-core/v2/docs/common" "github.com/jfrog/jfrog-cli-core/v2/plugins/components" coreconfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"