Skip to content

Commit f4fd125

Browse files
dependabot[bot]mergify[bot]
dependabot[bot]
authored and
mergify[bot]
committed
build(deps): bump golang.org/x/net from 0.56.0 to 0.57.0 in the golang-org-x group (#21430)
* build(deps): bump golang.org/x/net in the golang-org-x group Bumps the golang-org-x group with 1 update: [golang.org/x/net](https://github.com/golang/net). Updates `golang.org/x/net` from 0.56.0 to 0.57.0 - [Commits](golang/net@v0.56.0...v0.57.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.57.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] <support@github.com> * Update NOTICE.txt and NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> (cherry picked from commit 505a3c3) # Conflicts: # go.mod # go.sum
1 parent c25f007 commit f4fd125

4 files changed

Lines changed: 37 additions & 25 deletions

File tree

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5125,11 +5125,11 @@ Contents of probable licence file $GOMODCACHE/go.yaml.in/yaml/v2@v2.4.4/LICENSE:
51255125

51265126
--------------------------------------------------------------------------------
51275127
Dependency : golang.org/x/net
5128-
Version: v0.56.0
5128+
Version: v0.57.0
51295129
Licence type (autodetected): BSD-3-Clause
51305130
--------------------------------------------------------------------------------
51315131

5132-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.56.0/LICENSE:
5132+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.57.0/LICENSE:
51335133

51345134
Copyright 2009 The Go Authors.
51355135

@@ -12996,11 +12996,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1299612996

1299712997
--------------------------------------------------------------------------------
1299812998
Dependency : golang.org/x/text
12999-
Version: v0.38.0
12999+
Version: v0.40.0
1300013000
Licence type (autodetected): BSD-3-Clause
1300113001
--------------------------------------------------------------------------------
1300213002

13003-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.38.0/LICENSE:
13003+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.40.0/LICENSE:
1300413004

1300513005
Copyright 2009 The Go Authors.
1300613006

‎NOTICE.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5125,11 +5125,11 @@ Contents of probable licence file $GOMODCACHE/go.yaml.in/yaml/v2@v2.4.4/LICENSE:
51255125

51265126
--------------------------------------------------------------------------------
51275127
Dependency : golang.org/x/net
5128-
Version: v0.56.0
5128+
Version: v0.57.0
51295129
Licence type (autodetected): BSD-3-Clause
51305130
--------------------------------------------------------------------------------
51315131

5132-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.56.0/LICENSE:
5132+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.57.0/LICENSE:
51335133

51345134
Copyright 2009 The Go Authors.
51355135

@@ -15727,11 +15727,11 @@ THE SOFTWARE.
1572715727

1572815728
--------------------------------------------------------------------------------
1572915729
Dependency : golang.org/x/crypto
15730-
Version: v0.53.0
15730+
Version: v0.54.0
1573115731
Licence type (autodetected): BSD-3-Clause
1573215732
--------------------------------------------------------------------------------
1573315733

15734-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.53.0/LICENSE:
15734+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.54.0/LICENSE:
1573515735

1573615736
Copyright 2009 The Go Authors.
1573715737

@@ -15838,11 +15838,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1583815838

1583915839
--------------------------------------------------------------------------------
1584015840
Dependency : golang.org/x/text
15841-
Version: v0.38.0
15841+
Version: v0.40.0
1584215842
Licence type (autodetected): BSD-3-Clause
1584315843
--------------------------------------------------------------------------------
1584415844

15845-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.38.0/LICENSE:
15845+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.40.0/LICENSE:
1584615846

1584715847
Copyright 2009 The Go Authors.
1584815848

‎go.mod‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
go.uber.org/zap v1.28.0
4343
go.uber.org/zap/exp v0.3.0
4444
go.yaml.in/yaml/v2 v2.4.4
45-
golang.org/x/net v0.56.0
45+
golang.org/x/net v0.57.0
4646
golang.org/x/sync v0.22.0
4747
golang.org/x/term v0.45.0
4848
golang.org/x/time v0.15.0
@@ -227,14 +227,19 @@ require (
227227
go.opentelemetry.io/collector/featuregate v1.61.0 // indirect
228228
go.uber.org/multierr v1.11.0 // indirect
229229
go.yaml.in/yaml/v3 v3.0.4 // indirect
230+
<<<<<<< HEAD
230231
golang.org/x/crypto v0.53.0 // indirect
231232
golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9 // indirect
233+
=======
234+
golang.org/x/crypto v0.54.0 // indirect
235+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
236+
>>>>>>> 505a3c33 (build(deps): bump golang.org/x/net from 0.56.0 to 0.57.0 in the golang-org-x group (#21430))
232237
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
233-
golang.org/x/mod v0.36.0 // indirect
238+
golang.org/x/mod v0.37.0 // indirect
234239
golang.org/x/sys v0.47.0 // indirect
235-
golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6 // indirect
236-
golang.org/x/text v0.38.0 // indirect
237-
golang.org/x/tools v0.45.0 // indirect
240+
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57 // indirect
241+
golang.org/x/text v0.40.0 // indirect
242+
golang.org/x/tools v0.47.0 // indirect
238243
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
239244
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
240245
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect

‎go.sum‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -685,17 +685,24 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
685685
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
686686
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
687687
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
688+
<<<<<<< HEAD
688689
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
689690
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
690691
golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9 h1:4d4PbuBNwaxMXkXI8yiIYjydtMU+04RHeuSxJdgKftM=
691692
golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
693+
=======
694+
golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
695+
golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
696+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
697+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
698+
>>>>>>> 505a3c33 (build(deps): bump golang.org/x/net from 0.56.0 to 0.57.0 in the golang-org-x group (#21430))
692699
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
693700
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
694701
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
695702
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
696703
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
697-
golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
698-
golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
704+
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
705+
golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
699706
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
700707
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
701708
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -705,8 +712,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
705712
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
706713
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
707714
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
708-
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
709-
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
715+
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
716+
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
710717
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
711718
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
712719
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -739,8 +746,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
739746
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
740747
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
741748
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
742-
golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6 h1:HjU6IWBiAgRIdAJ9/y1rwCn+UELEmwV+VsTLzj/W4sE=
743-
golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6/go.mod h1:Eqhaxk/wZsWEH8CRxLwj6xzEJbz7k1EFGqx7nyCoabE=
749+
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57 h1:nwGZBCt+FnXUrGsj5vjzAsEmkcaFvd82BbOjECiFYZc=
750+
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57/go.mod h1:3AWMyWHS+caVoiEXpiq6+tzKA40J4vQT3MYr80ZtQpc=
744751
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
745752
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
746753
golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
@@ -751,17 +758,17 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
751758
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
752759
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
753760
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
754-
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
755-
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
761+
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
762+
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
756763
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
757764
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
758765
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
759766
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
760767
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
761768
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
762769
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
763-
golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
764-
golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
770+
golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
771+
golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
765772
golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
766773
golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
767774
golang.org/x/tools/go/vcs v0.1.0-deprecated h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4=

0 commit comments

Comments
 (0)