From 97afe66aebb0245b4cf260813778401586418e7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:47:42 +0000 Subject: [PATCH] build(deps): bump golang.org/x/term from 0.36.0 to 0.37.0 in the golang-org-x group (#19551) * build(deps): bump golang.org/x/term in the golang-org-x group Bumps the golang-org-x group with 1 update: [golang.org/x/term](https://github.com/golang/term). Updates `golang.org/x/term` from 0.36.0 to 0.37.0 - [Commits](https://github.com/golang/term/compare/v0.36.0...v0.37.0) --- updated-dependencies: - dependency-name: golang.org/x/term dependency-version: 0.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] 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 79268faf4c0138bfbfb2be00a60b02d918402f19) # Conflicts: # go.mod --- NOTICE-fips.txt | 8 ++++---- NOTICE.txt | 8 ++++---- go.mod | 8 +++++++- go.sum | 8 ++++---- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index a869fc5085..4b754c034d 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -5199,11 +5199,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/term -Version: v0.36.0 +Version: v0.37.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.36.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.37.0/LICENSE: Copyright 2009 The Go Authors. @@ -14475,11 +14475,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sys -Version: v0.37.0 +Version: v0.38.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.37.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.38.0/LICENSE: Copyright 2009 The Go Authors. diff --git a/NOTICE.txt b/NOTICE.txt index 9ecfc85010..17840ad7dd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5199,11 +5199,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/term -Version: v0.36.0 +Version: v0.37.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.36.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.37.0/LICENSE: Copyright 2009 The Go Authors. @@ -16564,11 +16564,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sys -Version: v0.37.0 +Version: v0.38.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.37.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.38.0/LICENSE: Copyright 2009 The Go Authors. diff --git a/go.mod b/go.mod index 5df2294494..10f7a643e2 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( go.uber.org/zap/exp v0.3.0 golang.org/x/net v0.46.0 golang.org/x/sync v0.18.0 - golang.org/x/term v0.36.0 + golang.org/x/term v0.37.0 golang.org/x/time v0.14.0 google.golang.org/grpc v1.76.0 google.golang.org/protobuf v1.36.10 @@ -234,9 +234,15 @@ require ( golang.org/x/crypto v0.43.0 // indirect golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect +<<<<<<< HEAD golang.org/x/mod v0.28.0 // indirect golang.org/x/sys v0.37.0 // indirect golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect +======= + golang.org/x/mod v0.29.0 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect +>>>>>>> 79268faf (build(deps): bump golang.org/x/term from 0.36.0 to 0.37.0 in the golang-org-x group (#19551)) golang.org/x/text v0.30.0 // indirect golang.org/x/tools v0.37.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect diff --git a/go.sum b/go.sum index 2f33317d4d..3684aff573 100644 --- a/go.sum +++ b/go.sum @@ -767,8 +767,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= -golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 h1:dHQOQddU4YHS5gY33/6klKjq7Gp3WwMyOXGNp5nzRj8= golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053/go.mod h1:+nZKN+XVh4LCiA9DV3ywrzN4gumyCnKjau3NGb9SGoE= @@ -782,8 +782,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= -golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= -golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=