From c878a93de2db235f666f538568802037e92415da Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Fri, 17 Apr 2026 13:59:50 +0530 Subject: [PATCH 1/2] replace gopkg.in/yaml.v2 with gopkg.in/yaml.v3 --- go.mod | 5 ++--- go.sum | 1 - utils/params.go | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a44727d93..5bba5a343 100644 --- a/go.mod +++ b/go.mod @@ -19,9 +19,8 @@ require ( github.com/stretchr/testify v1.11.1 github.com/urfave/cli/v2 v2.27.7 github.com/xeipuuv/gojsonschema v1.2.0 - golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 - golang.org/x/mod v0.34.0 - gopkg.in/yaml.v2 v2.4.0 + golang.org/x/exp v0.0.0-20260112195511-716be5621a96 + golang.org/x/mod v0.32.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 2d20ff376..89a814599 100644 --- a/go.sum +++ b/go.sum @@ -437,7 +437,6 @@ gopkg.in/ini.v1 v1.67.1/go.mod h1:x/cyOwCgZqOkJoDIJ3c1KNHMo10+nLGAhh+kn3Zizss= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/utils/params.go b/utils/params.go index de3a9e21e..62f8b55d1 100644 --- a/utils/params.go +++ b/utils/params.go @@ -13,7 +13,7 @@ import ( "strings" clientutils "github.com/jfrog/jfrog-client-go/utils" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/jfrog/jfrog-cli-security/utils/techutils" "github.com/jfrog/jfrog-cli-security/utils/xsc" From 98cb4d6cf4dcfceedf1353d5b7ccf432ff7b9a5b Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 28 Apr 2026 17:46:11 +0530 Subject: [PATCH 2/2] fix conflicts --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 5bba5a343..84b3c1be0 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/stretchr/testify v1.11.1 github.com/urfave/cli/v2 v2.27.7 github.com/xeipuuv/gojsonschema v1.2.0 - golang.org/x/exp v0.0.0-20260112195511-716be5621a96 - golang.org/x/mod v0.32.0 + golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 + golang.org/x/mod v0.34.0 gopkg.in/yaml.v3 v3.0.1 )