From 22353f20957e78493e1e4107f3af3be68b54fc85 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 15 Jul 2024 20:28:56 +0300 Subject: [PATCH] Fix npm script Signed-off-by: Michael Sverdlov --- artifactory_test.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/artifactory_test.go b/artifactory_test.go index de295ae8e..44934808f 100644 --- a/artifactory_test.go +++ b/artifactory_test.go @@ -2091,7 +2091,7 @@ func TestArtifactoryUploadExcludeByCli2Regex(t *testing.T) { assert.NoError(t, err, "Couldn't create file") // Upload files - runRt(t, "upload", filepath.ToSlash(absDirPath)+"(.*)", tests.RtRepo1, "--exclusions=(.*c)liTestFile1.*", "--regexp=true", "--flat=true") + runRt(t, "upload", filepath.ToSlash(absDirPath)+"/(.*)", tests.RtRepo1, "--exclusions=(.*c)liTestFile1.*", "--regexp=true", "--flat=true") // Check files exists in artifactory searchFilePath, err := tests.CreateSpec(tests.SearchRepo1ByInSuffix) diff --git a/go.mod b/go.mod index c0ff56fe8..ba2c9e390 100644 --- a/go.mod +++ b/go.mod @@ -167,9 +167,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20240715164156-613d1bc2b565 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240715171933-922df5dcc3b5 -replace github.com/jfrog/jfrog-client-go => github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240715164018-a47dfd726ed3 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240715171540-6351c20a47be // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81 diff --git a/go.sum b/go.sum index 8e01af901..456763c22 100644 --- a/go.sum +++ b/go.sum @@ -942,10 +942,14 @@ github.com/jfrog/gofrog v1.7.3 h1:34iaAZP9qY1dkjb8a0g0jn0u9/2k8RROx4hgnZNTAQw= github.com/jfrog/gofrog v1.7.3/go.mod h1:4MH6RLH0XF96Y3PK7Cy9u8YvxN9cbe0VJHlzEfMpJDA= 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-core/v2 v2.31.1-0.20240715171933-922df5dcc3b5 h1:yk8LthWOuoLovF6rT/mkpVBpN62WL8HsoSfJIPS40Gk= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240715171933-922df5dcc3b5/go.mod h1:kdJNwvB+y1eJm5o1PrHLpGYVBbPSGbwQ7tcEh8lnW9o= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= github.com/jfrog/jfrog-cli-security v1.5.1 h1:/aylVXaLash68pbo44VvdbtdkMAKo3O1iiakVbVJb4k= github.com/jfrog/jfrog-cli-security v1.5.1/go.mod h1:YtdCpDXI3gI3PPrPyEnk0yzT8JxQKG6/G/kn4Tl8HMk= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240715171540-6351c20a47be h1:9aO0uKhzw5mqLA3YiBU/wybr86wM892yyNhr1NW8VYY= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240715171540-6351c20a47be/go.mod h1:Y0PnOfoDwH8nJlFVapnzKJrCRZQciN5krTDY7vZxTZU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= @@ -1135,10 +1139,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20240715164156-613d1bc2b565 h1:4tK7AoXvSxVoVa1vAAbJAQg96g3f91R5CkBnilsVMH8= -github.com/sverdlov93/jfrog-cli-core/v2 v2.0.2-0.20240715164156-613d1bc2b565/go.mod h1:vXjx4ydqS50nTOVVfW0pCBvNu1Tya9c2axD6s+bMXpU= -github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240715164018-a47dfd726ed3 h1:pbgj9TnYIjUNR4+bKRA+UUC6nmus2bsFjhLo7iXJ8Wc= -github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240715164018-a47dfd726ed3/go.mod h1:Y0PnOfoDwH8nJlFVapnzKJrCRZQciN5krTDY7vZxTZU= github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw= github.com/testcontainers/testcontainers-go v0.32.0 h1:ug1aK08L3gCHdhknlTTwWjPHPS+/alvLJU/DRxTD/ME=