Skip to content

Commit c8fdffb

Browse files
dmitshurgopherbot
authored andcommitted
[release-branch.go1.20] all: tidy dependency versioning after release
Done with: go get golang.org/x/[email protected] go mod tidy go mod vendor go generate net/http # zero diff since CL 534255 already did this For #63417. For #63426. For CVE-2023-39325. Change-Id: Ib258e0d8165760a1082e02c2f4c5ce7d2a3c3c90 Reviewed-on: https://go-review.googlesource.com/c/go/+/534297 Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Michael Pratt <[email protected]> TryBot-Bypass: Dmitri Shuralyov <[email protected]>
1 parent 8042fd8 commit c8fdffb

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

src/cmd/internal/moddeps/moddeps_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import (
3131
// See issues 36852, 41409, and 43687.
3232
// (Also see golang.org/issue/27348.)
3333
func TestAllDependencies(t *testing.T) {
34-
t.Skip("TODO(#63427): 1.21.3 contains unreleased changes from vendored modules")
35-
3634
goBin := testenv.GoToolPath(t)
3735

3836
// Ensure that all packages imported within GOROOT

src/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.20
44

55
require (
66
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a
7-
golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d
7+
golang.org/x/net v0.4.1-0.20231010172015-16ed2c89e550
88
)
99

1010
require (

src/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a h1:diz9pEYuTIuLMJLs3rGDkeaTsNyRs6duYdFyPAxzE/U=
22
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
3-
golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d h1:KHU/KRz6+/yWyRHEC24m7T5gou5VSh62duch955ktBY=
4-
golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
3+
golang.org/x/net v0.4.1-0.20231010172015-16ed2c89e550 h1:esz6u1pHwcbo5lZtgSvsbxnii8/20eN+qlwyXIuCDf0=
4+
golang.org/x/net v0.4.1-0.20231010172015-16ed2c89e550/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
55
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
66
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=

src/vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ golang.org/x/crypto/cryptobyte/asn1
77
golang.org/x/crypto/hkdf
88
golang.org/x/crypto/internal/alias
99
golang.org/x/crypto/internal/poly1305
10-
# golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d
10+
# golang.org/x/net v0.4.1-0.20231010172015-16ed2c89e550
1111
## explicit; go 1.17
1212
golang.org/x/net/dns/dnsmessage
1313
golang.org/x/net/http/httpguts

0 commit comments

Comments
 (0)