Skip to content

Commit

Permalink
Fix broken dependency vbom.ml/util
Browse files Browse the repository at this point in the history 
The author of this dependency is removing the vanity url and has
instructed users to use the GitHub path.

This updates the dependency to the module-less pin to the v1 module tag.

fvbommel/util#5
fvbommel/util#6

Signed-off-by: Eddie Zaneski <[email protected]>
  • Loading branch information
@eddiezane
eddiezane committed Sep 2, 2020
1 parent b46612a commit ad3891d
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 22 deletions.
4 changes: 2 additions & 2 deletions LICENSES/vendor/vbom.ml/util/LICENSE → ...dor/github.com/fvbommel/sortorder/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ replace (
github.com/flynn/go-shlex => github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568
github.com/fogleman/gg => github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90
github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9
github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1
github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0
github.com/go-acme/lego => github.com/go-acme/lego v2.5.0+incompatible
github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible
Expand Down Expand Up @@ -411,7 +412,6 @@ replace (
github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe
github.com/vmware/govmomi => github.com/vmware/govmomi v0.20.3
github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1
github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77
github.com/yuin/goldmark => github.com/yuin/goldmark v1.1.27
go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.5
Expand Down Expand Up @@ -501,5 +501,4 @@ replace (
sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.1
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0
vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
)
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE=
github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
Expand Down Expand Up @@ -461,8 +463,6 @@ github.com/vmware/govmomi v0.20.3 h1:gpw/0Ku+6RgF3jsi7fnCLmlcikBHfKBCUcu1qgc16OU
github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek=
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
Expand Down Expand Up @@ -573,5 +573,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSq
sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
2 changes: 1 addition & 1 deletion vendor/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ filegroup(
"//vendor/github.com/exponent-io/jsonpath:all-srcs",
"//vendor/github.com/fatih/camelcase:all-srcs",
"//vendor/github.com/fsnotify/fsnotify:all-srcs",
"//vendor/github.com/fvbommel/sortorder:all-srcs",
"//vendor/github.com/ghodss/yaml:all-srcs",
"//vendor/github.com/go-bindata/go-bindata:all-srcs",
"//vendor/github.com/go-logr/logr:all-srcs",
Expand Down Expand Up @@ -525,7 +526,6 @@ filegroup(
"//vendor/sigs.k8s.io/structured-merge-diff/v4/typed:all-srcs",
"//vendor/sigs.k8s.io/structured-merge-diff/v4/value:all-srcs",
"//vendor/sigs.k8s.io/yaml:all-srcs",
"//vendor/vbom.ml/util/sortorder:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],
Expand Down
19 changes: 19 additions & 0 deletions vendor/github.com/fvbommel/sortorder/.gitignore
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/vbom.ml/util/sortorder/BUILD → vendor/github.com/fvbommel/sortorder/BUILD
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/vbom.ml/util/LICENSE → vendor/github.com/fvbommel/sortorder/LICENSE
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions vendor/github.com/fvbommel/sortorder/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/vbom.ml/util/sortorder/doc.go → vendor/github.com/fvbommel/sortorder/doc.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/fvbommel/sortorder/go.mod
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added vendor/github.com/fvbommel/sortorder/go.sum
View file
Empty file.
2 changes: 1 addition & 1 deletion vendor/vbom.ml/util/sortorder/natsort.go → .../github.com/fvbommel/sortorder/natsort.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@ github.com/fatih/camelcase
## explicit
github.com/fsnotify/fsnotify
# github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9
# github.com/fvbommel/sortorder v1.0.1 => github.com/fvbommel/sortorder v1.0.1
github.com/fvbommel/sortorder
# github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1
# github.com/ghodss/yaml v1.0.0 => github.com/ghodss/yaml v1.0.0
github.com/ghodss/yaml
# github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0
Expand Down Expand Up @@ -1088,7 +1091,6 @@ github.com/vmware/govmomi/vim25/xml
# github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
github.com/xiang90/probing
# github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
# github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1
# github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77
# github.com/yuin/goldmark => github.com/yuin/goldmark v1.1.27
# go.etcd.io/bbolt v1.3.5 => go.etcd.io/bbolt v1.3.5
Expand Down Expand Up @@ -2516,6 +2518,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit
sigs.k8s.io/yaml
# sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0
# vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
# vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
vbom.ml/util/sortorder
5 changes: 0 additions & 5 deletions vendor/vbom.ml/util/sortorder/README.md
View file

This file was deleted.

0 comments on commit ad3891d

Please sign in to comment.