Skip to content

Commit

Permalink
switch to gopkg.in/yaml.v3
Browse files Browse the repository at this point in the history
Looks like most other projects switched over to v3, so let's follow suit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah authored and milosgajdos committed Dec 14, 2023
1 parent b8fb08e commit 51002c6
Show file tree
Hide file tree
Showing 24 changed files with 4 additions and 10,043 deletions.
2 changes: 1 addition & 1 deletion configuration/configuration_test.go
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/stretchr/testify/suite"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// configStruct is a canonical example configuration, which should map to configYamlV0_1
Expand Down
2 changes: 1 addition & 1 deletion configuration/parser.go
Expand Up @@ -9,7 +9,7 @@ import (
"strings"

"github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// Version is a major/minor version pair of the form Major.Minor
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Expand Up @@ -33,7 +33,7 @@ require (
golang.org/x/crypto v0.15.0
golang.org/x/oauth2 v0.11.0
google.golang.org/api v0.126.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)

require (
Expand Down Expand Up @@ -98,5 +98,4 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
1 change: 0 additions & 1 deletion go.sum
Expand Up @@ -405,7 +405,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/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.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
2 changes: 1 addition & 1 deletion registry/registry_test.go
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/distribution/distribution/v3/internal/dcontext"
_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
"github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// Tests to ensure nextProtos returns the correct protocols when:
Expand Down
17 changes: 0 additions & 17 deletions vendor/gopkg.in/yaml.v2/.travis.yml

This file was deleted.

201 changes: 0 additions & 201 deletions vendor/gopkg.in/yaml.v2/LICENSE

This file was deleted.

31 changes: 0 additions & 31 deletions vendor/gopkg.in/yaml.v2/LICENSE.libyaml

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/gopkg.in/yaml.v2/NOTICE

This file was deleted.

0 comments on commit 51002c6

Please sign in to comment.