Skip to content

Commit 7450117

Browse files
dmitshurgopherbot
authored andcommitted
[release-branch.go1.21] 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 576075 already did this For CVE-2023-45288. For #65051. For #65387. Change-Id: I336670bdb3df2496c1e8d322c20794042fbc0d02 Reviewed-on: https://go-review.googlesource.com/c/go/+/576275 TryBot-Bypass: Dmitri Shuralyov <[email protected]> Reviewed-by: Than McIntosh <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]>
1 parent d8392e6 commit 7450117

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
@@ -33,8 +33,6 @@ import (
3333
// See issues 36852, 41409, and 43687.
3434
// (Also see golang.org/issue/27348.)
3535
func TestAllDependencies(t *testing.T) {
36-
t.Skip("TODO(#65051): 1.21.9 contains unreleased changes from vendored modules")
37-
3836
goBin := testenv.GoToolPath(t)
3937

4038
// 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.21
44

55
require (
66
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
7-
golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536
7+
golang.org/x/net v0.12.1-0.20240403170600-947e999f3fbf
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.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
22
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
3-
golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536 h1:QEPT0Le4+itOUqHbs7yUz5y7FoAOuK1ibDlfTcVguHM=
4-
golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
3+
golang.org/x/net v0.12.1-0.20240403170600-947e999f3fbf h1:Sx7GT2w2lBn0wLFc+UkRDPosNMb3d+SHWF2Hg5T4+TQ=
4+
golang.org/x/net v0.12.1-0.20240403170600-947e999f3fbf/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
55
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
66
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=

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.12.1-0.20240327214420-1a2eef3ba536
10+
# golang.org/x/net v0.12.1-0.20240403170600-947e999f3fbf
1111
## explicit; go 1.17
1212
golang.org/x/net/dns/dnsmessage
1313
golang.org/x/net/http/httpguts

0 commit comments

Comments
 (0)