diff --git a/go.mod b/go.mod index 158157f734a7..e5b609c88b8e 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/sivchari/containedctx v1.0.3 github.com/sonatard/noctx v0.4.0 github.com/sourcegraph/go-diff v0.7.0 - github.com/spf13/cobra v1.10.1 + github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 github.com/spf13/viper v1.12.0 github.com/ssgreg/nlreturn/v2 v2.2.1 @@ -136,11 +136,11 @@ require ( go.augendre.info/arangolint v0.3.1 go.augendre.info/fatcontext v0.9.0 go.uber.org/automaxprocs v1.6.0 + go.yaml.in/yaml/v3 v3.0.4 golang.org/x/mod v0.30.0 golang.org/x/sync v0.18.0 golang.org/x/sys v0.38.0 golang.org/x/tools v0.39.0 - gopkg.in/yaml.v3 v3.0.1 honnef.co/go/tools v0.6.1 mvdan.cc/gofumpt v0.9.2 mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 @@ -224,4 +224,5 @@ require ( google.golang.org/protobuf v1.36.8 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index c0f26984411e..828b281711a0 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= -github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= +github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= +github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= diff --git a/pkg/commands/config_verify.go b/pkg/commands/config_verify.go index ef7a4e094dbb..1bbc47d8d64a 100644 --- a/pkg/commands/config_verify.go +++ b/pkg/commands/config_verify.go @@ -17,7 +17,7 @@ import ( "github.com/santhosh-tekuri/jsonschema/v6" "github.com/spf13/cobra" "github.com/spf13/pflag" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "github.com/golangci/golangci-lint/v2/pkg/exitcodes" ) diff --git a/pkg/commands/internal/configuration.go b/pkg/commands/internal/configuration.go index f9de4c47a737..0982c3eca4df 100644 --- a/pkg/commands/internal/configuration.go +++ b/pkg/commands/internal/configuration.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) const base = ".custom-gcl" diff --git a/pkg/commands/internal/migrate/parser/parser.go b/pkg/commands/internal/migrate/parser/parser.go index ea00b41f5a78..293eaf18a5b9 100644 --- a/pkg/commands/internal/migrate/parser/parser.go +++ b/pkg/commands/internal/migrate/parser/parser.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/pelletier/go-toml/v2" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) type File interface { diff --git a/pkg/commands/internal/migrate/versionone/linters_settings.go b/pkg/commands/internal/migrate/versionone/linters_settings.go index 44583b7d34e0..3c641541c3d9 100644 --- a/pkg/commands/internal/migrate/versionone/linters_settings.go +++ b/pkg/commands/internal/migrate/versionone/linters_settings.go @@ -3,7 +3,7 @@ package versionone import ( "encoding" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "github.com/golangci/golangci-lint/v2/pkg/commands/internal/migrate/ptr" ) diff --git a/pkg/commands/run.go b/pkg/commands/run.go index d1c96b88eec0..93efa6d9cd04 100644 --- a/pkg/commands/run.go +++ b/pkg/commands/run.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" "go.uber.org/automaxprocs/maxprocs" + "go.yaml.in/yaml/v3" "golang.org/x/mod/sumdb/dirhash" - "gopkg.in/yaml.v3" "github.com/golangci/golangci-lint/v2/internal/cache" "github.com/golangci/golangci-lint/v2/pkg/config" diff --git a/pkg/goformatters/gci/internal/config/config.go b/pkg/goformatters/gci/internal/config/config.go index c859b442fc23..13ca6dd86fd8 100644 --- a/pkg/goformatters/gci/internal/config/config.go +++ b/pkg/goformatters/gci/internal/config/config.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "github.com/daixiang0/gci/pkg/config" "github.com/daixiang0/gci/pkg/section" diff --git a/pkg/golinters/forbidigo/forbidigo.go b/pkg/golinters/forbidigo/forbidigo.go index 796faf3a6ef0..1473b4d6e36e 100644 --- a/pkg/golinters/forbidigo/forbidigo.go +++ b/pkg/golinters/forbidigo/forbidigo.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/ashanbrown/forbidigo/v2/forbidigo" + "go.yaml.in/yaml/v3" "golang.org/x/tools/go/analysis" - "gopkg.in/yaml.v3" "github.com/golangci/golangci-lint/v2/pkg/config" "github.com/golangci/golangci-lint/v2/pkg/goanalysis" diff --git a/pkg/lint/linter/config.go b/pkg/lint/linter/config.go index 0287dece95d4..a5b98413d405 100644 --- a/pkg/lint/linter/config.go +++ b/pkg/lint/linter/config.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" + "go.yaml.in/yaml/v3" "golang.org/x/tools/go/packages" - "gopkg.in/yaml.v3" "github.com/golangci/golangci-lint/v2/pkg/config" ) diff --git a/scripts/website/expand_templates/configuration.go b/scripts/website/expand_templates/configuration.go index 25bd10bf53b4..f740412a56a4 100644 --- a/scripts/website/expand_templates/configuration.go +++ b/scripts/website/expand_templates/configuration.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "github.com/golangci/golangci-lint/v2/pkg/config" "github.com/golangci/golangci-lint/v2/scripts/website/types" diff --git a/test/configuration_file_test.go b/test/configuration_file_test.go index 6601b050fa22..9f86492b9dca 100644 --- a/test/configuration_file_test.go +++ b/test/configuration_file_test.go @@ -11,7 +11,7 @@ import ( "github.com/santhosh-tekuri/jsonschema/v6" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) func Test_validateTestConfigurationFiles(t *testing.T) {