This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 45e553aaea Update Go version to 1.22.4 (#8021)
45e553aaea is described below
commit 45e553aaeae0e5751c7a5d4762d7e53cef41a612
Author: asf-ci-trafficcontrol
<[email protected]>
AuthorDate: Wed Jun 5 22:25:19 2024 -0400
Update Go version to 1.22.4 (#8021)
* Update Go version to 1.22.4
* Update golang.org/x/ dependencies for go1.22.4
---------
Co-authored-by: asf-ci-trafficcontrol
<[email protected]>
---
.env | 2 +-
GO_VERSION | 2 +-
go.mod | 2 +-
go.sum | 3 +--
vendor/modules.txt | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.env b/.env
index b1459c9b4b..c55443e88b 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
ATS_VERSION=9.1.2
-GO_VERSION=1.22.3
+GO_VERSION=1.22.4
diff --git a/GO_VERSION b/GO_VERSION
index 89144dbc38..2a0ba77cc5 100644
--- a/GO_VERSION
+++ b/GO_VERSION
@@ -1 +1 @@
-1.22.3
+1.22.4
diff --git a/go.mod b/go.mod
index 79161af8ef..de3f19a1ea 100644
--- a/go.mod
+++ b/go.mod
@@ -49,7 +49,7 @@ require (
github.com/pkg/errors v0.9.1
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.21.0
- golang.org/x/net v0.23.0
+ golang.org/x/net v0.21.0
golang.org/x/sys v0.18.0
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
gopkg.in/yaml.v2 v2.4.0
diff --git a/go.sum b/go.sum
index ffd7a93f68..0c73c132ef 100644
--- a/go.sum
+++ b/go.sum
@@ -1554,9 +1554,8 @@ golang.org/x/net
v0.0.0-20211013171255-e13a2654a71e/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4fdbc08c00..630e742fc0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -285,7 +285,7 @@ golang.org/x/crypto/md4
golang.org/x/crypto/ocsp
golang.org/x/crypto/pbkdf2
golang.org/x/crypto/scrypt
-# golang.org/x/net v0.23.0
+# golang.org/x/net v0.21.0
## explicit; go 1.18
golang.org/x/net/bpf
golang.org/x/net/html