Skip to content

Commit d045c10

Browse files
dimsdims
committed
sync 1.5 branch go.mod with main
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 116b2e0 commit d045c10

562 files changed

Lines changed: 53405 additions & 18165 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go.mod‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/containerd/containerd
33
go 1.16
44

55
require (
6-
github.com/Microsoft/go-winio v0.4.17
7-
github.com/Microsoft/hcsshim v0.8.16
6+
github.com/Microsoft/go-winio v0.5.0
7+
github.com/Microsoft/hcsshim v0.8.17
88
github.com/containerd/aufs v1.0.0
99
github.com/containerd/btrfs v1.0.0
1010
github.com/containerd/cgroups v1.0.1
@@ -19,7 +19,7 @@ require (
1919
github.com/containerd/typeurl v1.0.2
2020
github.com/containerd/zfs v1.0.0
2121
github.com/containernetworking/plugins v0.9.1
22-
github.com/coreos/go-systemd/v22 v22.1.0
22+
github.com/coreos/go-systemd/v22 v22.3.2
2323
github.com/davecgh/go-spew v1.1.1
2424
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
2525
github.com/docker/go-metrics v0.0.1
@@ -28,8 +28,8 @@ require (
2828
github.com/fsnotify/fsnotify v1.4.9
2929
github.com/gogo/googleapis v1.4.0
3030
github.com/gogo/protobuf v1.3.2
31-
github.com/golang/protobuf v1.4.3
32-
github.com/google/go-cmp v0.5.4
31+
github.com/golang/protobuf v1.5.0
32+
github.com/google/go-cmp v0.5.5
3333
github.com/google/uuid v1.2.0
3434
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
3535
github.com/hashicorp/go-multierror v1.0.0
@@ -40,23 +40,23 @@ require (
4040
github.com/moby/sys/symlink v0.1.0
4141
github.com/opencontainers/go-digest v1.0.0
4242
github.com/opencontainers/image-spec v1.0.1
43-
github.com/opencontainers/runc v1.0.0-rc93
44-
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
45-
github.com/opencontainers/selinux v1.8.0
43+
github.com/opencontainers/runc v1.0.0
44+
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
45+
github.com/opencontainers/selinux v1.8.2
4646
github.com/pelletier/go-toml v1.8.1
4747
github.com/pkg/errors v0.9.1
4848
github.com/prometheus/client_golang v1.7.1
4949
github.com/prometheus/procfs v0.6.0 // indirect; temporarily force v0.6.0, which was previously defined in imgcrypt as explicit version
5050
github.com/satori/go.uuid v1.2.0 // indirect
51-
github.com/sirupsen/logrus v1.7.0
51+
github.com/sirupsen/logrus v1.8.1
5252
github.com/stretchr/testify v1.6.1
5353
github.com/tchap/go-patricia v2.2.6+incompatible
5454
github.com/urfave/cli v1.22.2
5555
go.etcd.io/bbolt v1.3.5
5656
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
5757
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
58-
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
59-
google.golang.org/grpc v1.33.2
58+
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
59+
google.golang.org/grpc v1.38.0
6060
gotest.tools/v3 v3.0.3
6161
k8s.io/api v0.20.6
6262
k8s.io/apimachinery v0.20.6
@@ -74,9 +74,7 @@ replace (
7474
// dependency on itself through plugins. see .empty-mod/go.mod for details
7575
github.com/containerd/containerd => ./.empty-mod/
7676
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
77-
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
7877
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
7978
github.com/urfave/cli => github.com/urfave/cli v1.22.1
8079
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
81-
google.golang.org/grpc => google.golang.org/grpc v1.27.1
8280
)

‎go.sum‎

Lines changed: 74 additions & 20 deletions
Large diffs are not rendered by default.

‎integration/client/go.mod‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ module github.com/containerd/containerd/integration/client
33
go 1.15
44

55
require (
6-
github.com/Microsoft/hcsshim v0.8.16
6+
github.com/Microsoft/hcsshim v0.8.17
77
github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1
88
github.com/containerd/cgroups v1.0.1
99
// the actual version of containerd is replaced with the code at the root of this repository
10-
github.com/containerd/containerd v1.5.0-rc.0
10+
github.com/containerd/containerd v1.5.1
1111
github.com/containerd/go-runc v1.0.0
1212
github.com/containerd/ttrpc v1.0.2
1313
github.com/containerd/typeurl v1.0.2
1414
github.com/gogo/protobuf v1.3.2
1515
github.com/opencontainers/go-digest v1.0.0
1616
github.com/opencontainers/image-spec v1.0.1
17-
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
17+
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
1818
github.com/pkg/errors v0.9.1
19-
github.com/sirupsen/logrus v1.7.0
20-
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
19+
github.com/sirupsen/logrus v1.8.1
20+
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
2121
gotest.tools/v3 v3.0.3
2222
)
2323

@@ -33,9 +33,7 @@ replace (
3333
// root, because that's the actual version expected by the "containerd/containerd"
3434
// dependency above.
3535
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
36-
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
3736
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
3837
github.com/urfave/cli => github.com/urfave/cli v1.22.1
3938
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
40-
google.golang.org/grpc => google.golang.org/grpc v1.27.1
4139
)

0 commit comments

Comments
 (0)