diff --git a/compose/compose.go b/compose/compose.go index fdf6f8b756d..b10db4df1fe 100644 --- a/compose/compose.go +++ b/compose/compose.go @@ -28,7 +28,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" "github.com/hypermodeinc/dgraph/v24/x" ) diff --git a/go.mod b/go.mod index b61f448abb5..a6f099c0444 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( golang.org/x/tools v0.29.0 google.golang.org/grpc v1.70.0 google.golang.org/protobuf v1.36.3 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -165,7 +165,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect gopkg.in/DataDog/dd-trace-go.v1 v1.22.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/v3 v3.5.1 // indirect ) diff --git a/graphql/e2e/common/error.go b/graphql/e2e/common/error.go index 9232ddd0574..74806c5e429 100644 --- a/graphql/e2e/common/error.go +++ b/graphql/e2e/common/error.go @@ -32,7 +32,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/peer" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/dgraph-io/dgo/v240" "github.com/dgraph-io/dgo/v240/protos/api" diff --git a/graphql/e2e/custom_logic/cmd/go.mod b/graphql/e2e/custom_logic/cmd/go.mod index da7af65a331..5e63487ba90 100644 --- a/graphql/e2e/custom_logic/cmd/go.mod +++ b/graphql/e2e/custom_logic/cmd/go.mod @@ -4,5 +4,5 @@ go 1.22.7 require ( github.com/graph-gophers/graphql-go v1.5.0 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 ) diff --git a/graphql/e2e/custom_logic/cmd/go.sum b/graphql/e2e/custom_logic/cmd/go.sum index 2312149e54e..fddcb3cde80 100644 --- a/graphql/e2e/custom_logic/cmd/go.sum +++ b/graphql/e2e/custom_logic/cmd/go.sum @@ -15,6 +15,6 @@ go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5f golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -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= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/graphql/e2e/custom_logic/cmd/main.go b/graphql/e2e/custom_logic/cmd/main.go index c428b10fa00..4b8b426c8f2 100644 --- a/graphql/e2e/custom_logic/cmd/main.go +++ b/graphql/e2e/custom_logic/cmd/main.go @@ -32,7 +32,7 @@ import ( graphql "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type expectedRequest struct { diff --git a/graphql/resolve/auth_test.go b/graphql/resolve/auth_test.go index 0d486c2b8a0..4ce0a15e0b5 100644 --- a/graphql/resolve/auth_test.go +++ b/graphql/resolve/auth_test.go @@ -28,7 +28,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" dgoapi "github.com/dgraph-io/dgo/v240/protos/api" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules diff --git a/graphql/resolve/mutation_test.go b/graphql/resolve/mutation_test.go index ebb66b6078a..0a73ec639f8 100644 --- a/graphql/resolve/mutation_test.go +++ b/graphql/resolve/mutation_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" dgoapi "github.com/dgraph-io/dgo/v240/protos/api" "github.com/hypermodeinc/dgraph/v24/graphql/dgraph" diff --git a/graphql/resolve/query_test.go b/graphql/resolve/query_test.go index 55a5ef54815..c76f7a55d4b 100644 --- a/graphql/resolve/query_test.go +++ b/graphql/resolve/query_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules "github.com/hypermodeinc/dgraph/v24/graphql/dgraph" diff --git a/graphql/resolve/resolver_error_test.go b/graphql/resolve/resolver_error_test.go index d1dbdd38914..ba374a904d9 100644 --- a/graphql/resolve/resolver_error_test.go +++ b/graphql/resolve/resolver_error_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/pkg/errors" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" dgoapi "github.com/dgraph-io/dgo/v240/protos/api" "github.com/hypermodeinc/dgraph/v24/graphql/schema" diff --git a/graphql/schema/rules.go b/graphql/schema/rules.go index 56492e54c02..2020b7c21c1 100644 --- a/graphql/schema/rules.go +++ b/graphql/schema/rules.go @@ -29,7 +29,7 @@ import ( "github.com/dgraph-io/gqlparser/v2/parser" "github.com/dgraph-io/gqlparser/v2/validator" "github.com/hypermodeinc/dgraph/v24/x" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) const ( diff --git a/graphql/schema/schemagen_test.go b/graphql/schema/schemagen_test.go index 28722a04579..c8aad050624 100644 --- a/graphql/schema/schemagen_test.go +++ b/graphql/schema/schemagen_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/dgraph-io/gqlparser/v2/gqlerror" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" diff --git a/graphql/schema/wrappers_test.go b/graphql/schema/wrappers_test.go index fbf3e576443..4b55d5497eb 100644 --- a/graphql/schema/wrappers_test.go +++ b/graphql/schema/wrappers_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/pkg/errors" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/hypermodeinc/dgraph/v24/x" diff --git a/systest/ldbc/ldbc_test.go b/systest/ldbc/ldbc_test.go index 780b1a0cd5e..8f565b1847e 100644 --- a/systest/ldbc/ldbc_test.go +++ b/systest/ldbc/ldbc_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/hypermodeinc/dgraph/v24/testutil" )