Skip to content

Commit

Permalink
upgrade golang/x/net
Browse files Browse the repository at this point in the history
  • Loading branch information
costanic committed Mar 5, 2022
1 parent 2ac1e8a commit e062028
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 70 deletions.
45 changes: 21 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ module github.com/PelionIoT/maestro

go 1.16

replace (
github.com/shirou/gopsutil v2.16.12+incompatible => github.com/PelionIoT/gopsutil v2.16.12+incompatible
golang.org/x/net => golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // Required to fix CVE-2021-33194
)

require (
github.com/PelionIoT/httprouter v0.0.0-20170104185816-8a45e95fc75c
github.com/PelionIoT/maestro-plugins-template v0.0.0-20190409060302-5b22b1f86b05
Expand All @@ -11,44 +16,36 @@ require (
github.com/PelionIoT/stow v2.2.1-0.20170902223607-b0e83fd073d4+incompatible
github.com/PelionIoT/structmutate v0.0.0-20190409035007-57b37c3ac1d9
github.com/PelionIoT/zeroconf v0.0.0-20180517163623-78d055b6305c
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944 // indirect
github.com/armPelionEdge/dhcp4 v0.0.0-20180917122751-7f54fcf15bd7
github.com/armPelionEdge/dhcp4client v0.0.0-20190409055833-be924652a34a
github.com/armPelionEdge/netlink v0.0.0-20190409055558-1cddec0bf368 // indirect
github.com/armPelionEdge/wpa-connect v0.0.0-20200827001433-10297d26dfc8
github.com/boltdb/bolt v1.3.2-0.20180302180052-fd01fc79c553
github.com/cavaliercoder/grab v2.0.0+incompatible
github.com/cenkalti/backoff v2.1.0+incompatible // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c // indirect
github.com/d2g/dhcp4client v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.7.2-0.20180927150649-699df6a3acf6
github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/deckarep/golang-set v1.8.0
github.com/dsnet/compress v0.0.1 // indirect
github.com/frankban/quicktest v1.14.2 // indirect
github.com/godbus/dbus v4.1.0+incompatible // indirect
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
github.com/gorilla/websocket v1.4.1-0.20181206070239-95ba29eb981b
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1
github.com/golang/snappy v0.0.4 // indirect
github.com/gorilla/websocket v1.5.0
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/mholt/archiver v3.1.2-0.20181212200041-4e41ad6272dc+incompatible
github.com/miekg/dns v1.1.2-0.20181219162826-5f5f2380fc10 // indirect
github.com/nwaples/rardecode v1.0.1-0.20181025094117-197ef08ef68c // indirect
github.com/miekg/dns v1.1.46 // indirect
github.com/nwaples/rardecode v1.1.2 // indirect
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/pierrec/lz4 v1.0.2-0.20181027085611-623b5a2f4d2a // indirect
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
github.com/shirou/gopsutil v3.21.6+incompatible
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/satori/go.uuid v1.2.0
github.com/shirou/gopsutil v2.16.12+incompatible
github.com/stretchr/testify v1.7.0 // indirect
github.com/ulikunitz/xz v0.5.5 // indirect
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
gopkg.in/yaml.v2 v2.4.0
)

replace github.com/shirou/gopsutil v2.16.12+incompatible => github.com/PelionIoT/gopsutil v2.16.12+incompatible
Loading

0 comments on commit e062028

Please sign in to comment.