Skip to content

Commit 7ed36ad

Browse files
dependabot[bot]mergify[bot]
dependabot[bot]
authored and
mergify[bot]
committed
build(deps): bump golang.org/x/net from 0.46.0 to 0.47.0 in the golang-org-x group (#19555)
* 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.46.0 to 0.47.0 - [Commits](golang/net@v0.46.0...v0.47.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.47.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] <[email protected]> * Update NOTICE.txt * Update NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 78f1885) # Conflicts: # go.mod
1 parent b950141 commit 7ed36ad

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5125,11 +5125,11 @@ THE SOFTWARE.
51255125

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

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

51345134
Copyright 2009 The Go Authors.
51355135

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

1451314513
--------------------------------------------------------------------------------
1451414514
Dependency : golang.org/x/text
14515-
Version: v0.30.0
14515+
Version: v0.31.0
1451614516
Licence type (autodetected): BSD-3-Clause
1451714517
--------------------------------------------------------------------------------
1451814518

14519-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.30.0/LICENSE:
14519+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.31.0/LICENSE:
1452014520

1452114521
Copyright 2009 The Go Authors.
1452214522

‎NOTICE.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5125,11 +5125,11 @@ THE SOFTWARE.
51255125

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

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

51345134
Copyright 2009 The Go Authors.
51355135

@@ -16490,11 +16490,11 @@ Contents of probable licence file $GOMODCACHE/go.yaml.in/yaml/[email protected]/LICENSE:
1649016490

1649116491
--------------------------------------------------------------------------------
1649216492
Dependency : golang.org/x/crypto
16493-
Version: v0.43.0
16493+
Version: v0.44.0
1649416494
Licence type (autodetected): BSD-3-Clause
1649516495
--------------------------------------------------------------------------------
1649616496

16497-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.43.0/LICENSE:
16497+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.44.0/LICENSE:
1649816498

1649916499
Copyright 2009 The Go Authors.
1650016500

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

1660216602
--------------------------------------------------------------------------------
1660316603
Dependency : golang.org/x/text
16604-
Version: v0.30.0
16604+
Version: v0.31.0
1660516605
Licence type (autodetected): BSD-3-Clause
1660616606
--------------------------------------------------------------------------------
1660716607

16608-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.30.0/LICENSE:
16608+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.31.0/LICENSE:
1660916609

1661016610
Copyright 2009 The Go Authors.
1661116611

‎go.mod‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
go.opentelemetry.io/proto/otlp v1.9.0
4343
go.uber.org/zap v1.27.0
4444
go.uber.org/zap/exp v0.3.0
45-
golang.org/x/net v0.46.0
45+
golang.org/x/net v0.47.0
4646
golang.org/x/sync v0.18.0
4747
golang.org/x/term v0.36.0
4848
golang.org/x/time v0.14.0
@@ -231,14 +231,22 @@ require (
231231
go.opentelemetry.io/collector/featuregate v1.45.0 // indirect
232232
go.uber.org/multierr v1.11.0 // indirect
233233
go.yaml.in/yaml/v2 v2.4.2 // indirect
234-
golang.org/x/crypto v0.43.0 // indirect
234+
golang.org/x/crypto v0.44.0 // indirect
235235
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect
236236
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
237+
<<<<<<< HEAD
237238
golang.org/x/mod v0.28.0 // indirect
238239
golang.org/x/sys v0.37.0 // indirect
239240
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
240241
golang.org/x/text v0.30.0 // indirect
241242
golang.org/x/tools v0.37.0 // indirect
243+
=======
244+
golang.org/x/mod v0.29.0 // indirect
245+
golang.org/x/sys v0.38.0 // indirect
246+
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
247+
golang.org/x/text v0.31.0 // indirect
248+
golang.org/x/tools v0.38.0 // indirect
249+
>>>>>>> 78f18851 (build(deps): bump golang.org/x/net from 0.46.0 to 0.47.0 in the golang-org-x group (#19555))
242250
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
243251
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
244252
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -687,8 +687,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
687687
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
688688
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
689689
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
690-
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
691-
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
690+
golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
691+
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
692692
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 h1:3yiSh9fhy5/RhCSntf4Sy0Tnx50DmMpQ4MQdKKk4yg4=
693693
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50/go.mod h1:rT6SFzZ7oxADUDx58pcaKFTcZ+inxAa9fTrYx/uVYwg=
694694
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
@@ -721,8 +721,8 @@ golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
721721
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
722722
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
723723
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
724-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
725-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
724+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
725+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
726726
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
727727
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
728728
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -796,8 +796,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
796796
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
797797
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
798798
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
799-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
800-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
799+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
800+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
801801
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
802802
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
803803
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)