Skip to content

Commit 8261ed2

Browse files
mergify[bot]swiatekmCopilot
authored
[9.3] (backport #14954) [deps] Bump google.golang.org/* dependencies (#14970)
* [deps] Bump google.golang.org/* dependencies (#14954) - google.golang.org/api: v0.275.0 -> v0.284.0 - google.golang.org/grpc: v1.81.0 -> v1.81.1 Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit e9de4fe) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # internal/edot/go.mod * fix: resolve merge-conflict markers in dependency bump backport * chore: regenerate NOTICE files with mage notice --------- Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 98900f6 commit 8261ed2

6 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79335,11 +79335,11 @@ Contents of probable licence file $GOMODCACHE/github.com/google/s2a-go@v0.1.9/LI
7933579335

7933679336
--------------------------------------------------------------------------------
7933779337
Dependency : github.com/googleapis/enterprise-certificate-proxy
79338-
Version: v0.3.15
79338+
Version: v0.3.16
7933979339
Licence type (autodetected): Apache-2.0
7934079340
--------------------------------------------------------------------------------
7934179341

79342-
Contents of probable licence file $GOMODCACHE/github.com/googleapis/enterprise-certificate-proxy@v0.3.15/LICENSE:
79342+
Contents of probable licence file $GOMODCACHE/github.com/googleapis/enterprise-certificate-proxy@v0.3.16/LICENSE:
7934379343

7934479344

7934579345
Apache License
@@ -104200,11 +104200,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
104200104200

104201104201
--------------------------------------------------------------------------------
104202104202
Dependency : google.golang.org/api
104203-
Version: v0.279.0
104203+
Version: v0.284.0
104204104204
Licence type (autodetected): BSD-3-Clause
104205104205
--------------------------------------------------------------------------------
104206104206

104207-
Contents of probable licence file $GOMODCACHE/google.golang.org/api@v0.279.0/LICENSE:
104207+
Contents of probable licence file $GOMODCACHE/google.golang.org/api@v0.284.0/LICENSE:
104208104208

104209104209
Copyright (c) 2011 Google Inc. All rights reserved.
104210104210

‎NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84100,11 +84100,11 @@ Contents of probable licence file $GOMODCACHE/github.com/google/s2a-go@v0.1.9/LI
8410084100

8410184101
--------------------------------------------------------------------------------
8410284102
Dependency : github.com/googleapis/enterprise-certificate-proxy
84103-
Version: v0.3.15
84103+
Version: v0.3.16
8410484104
Licence type (autodetected): Apache-2.0
8410584105
--------------------------------------------------------------------------------
8410684106

84107-
Contents of probable licence file $GOMODCACHE/github.com/googleapis/enterprise-certificate-proxy@v0.3.15/LICENSE:
84107+
Contents of probable licence file $GOMODCACHE/github.com/googleapis/enterprise-certificate-proxy@v0.3.16/LICENSE:
8410884108

8410984109

8411084110
Apache License
@@ -113025,11 +113025,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
113025113025

113026113026
--------------------------------------------------------------------------------
113027113027
Dependency : google.golang.org/api
113028-
Version: v0.279.0
113028+
Version: v0.284.0
113029113029
Licence type (autodetected): BSD-3-Clause
113030113030
--------------------------------------------------------------------------------
113031113031

113032-
Contents of probable licence file $GOMODCACHE/google.golang.org/api@v0.279.0/LICENSE:
113032+
Contents of probable licence file $GOMODCACHE/google.golang.org/api@v0.284.0/LICENSE:
113033113033

113034113034
Copyright (c) 2011 Google Inc. All rights reserved.
113035113035

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ require (
7777
golang.org/x/text v0.38.0
7878
golang.org/x/time v0.15.0
7979
golang.org/x/tools v0.46.0
80-
google.golang.org/api v0.279.0
80+
google.golang.org/api v0.284.0
8181
google.golang.org/grpc v1.81.1
8282
google.golang.org/protobuf v1.36.11
8383
gopkg.in/ini.v1 v1.67.0
@@ -181,7 +181,7 @@ require (
181181
github.com/google/s2a-go v0.1.9 // indirect
182182
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
183183
github.com/google/uuid v1.6.0 // indirect
184-
github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
184+
github.com/googleapis/enterprise-certificate-proxy v0.3.16 // indirect
185185
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
186186
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
187187
github.com/gosuri/uitable v0.0.4 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU
311311
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
312312
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
313313
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
314-
github.com/googleapis/enterprise-certificate-proxy v0.3.15 h1:xolVQTEXusUcAA5UgtyRLjelpFFHWlPQ4XfWGc7MBas=
315-
github.com/googleapis/enterprise-certificate-proxy v0.3.15/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
314+
github.com/googleapis/enterprise-certificate-proxy v0.3.16 h1:F/VPrx0YPBdksZJQdCAp0WUsqnNmZpUZszzfYt0M5Dw=
315+
github.com/googleapis/enterprise-certificate-proxy v0.3.16/go.mod h1:9Yb0eAkH/Xqhvv3zbeKf/+wMJqCeocWc6KIhDvEAuYE=
316316
github.com/googleapis/gax-go/v2 v2.22.0 h1:PjIWBpgGIVKGoCXuiCoP64altEJCj3/Ei+kSU5vlZD4=
317317
github.com/googleapis/gax-go/v2 v2.22.0/go.mod h1:irWBbALSr0Sk3qlqb9SyJ1h68WjgeFuiOzI4Rqw5+aY=
318318
github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
@@ -831,8 +831,8 @@ gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw
831831
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
832832
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
833833
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
834-
google.golang.org/api v0.279.0 h1:hsx2M2OaRcaKtVYK6vXEUnQvdjnend7ZYES+lYaot74=
835-
google.golang.org/api v0.279.0/go.mod h1:B9TqLBwJqVjp1mtt7WeoQwWRwvu/400y5lETOql+giQ=
834+
google.golang.org/api v0.284.0 h1:i+cKTgeQRcRySkP7QTl5PDO7/pAm8EcMFIUMlNbk4Vc=
835+
google.golang.org/api v0.284.0/go.mod h1:AU44fU+XVZOCcd8uLaBIa/ZgzgPf/0qqY3+m7lQaado=
836836
google.golang.org/genproto v0.0.0-20260401024825-9d38bb4040a9 h1:w8JYjr7zHemS95YA5FFwk+fUv5tdQU4I8twN9bFdxVU=
837837
google.golang.org/genproto v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:YCEC8W7HTtK7iBv+pI7g7hGAi7qdGB6bQXw3BIYAusM=
838838
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8=

‎internal/edot/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ require (
442442
github.com/google/go-tpm v0.9.8 // indirect
443443
github.com/google/s2a-go v0.1.9 // indirect
444444
github.com/google/uuid v1.6.0 // indirect
445-
github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
445+
github.com/googleapis/enterprise-certificate-proxy v0.3.16 // indirect
446446
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
447447
github.com/gophercloud/gophercloud/v2 v2.11.1 // indirect
448448
github.com/gorilla/handlers v1.5.2 // indirect
@@ -737,7 +737,7 @@ require (
737737
golang.org/x/tools v0.46.0 // indirect
738738
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
739739
gonum.org/v1/gonum v0.17.0 // indirect
740-
google.golang.org/api v0.279.0 // indirect
740+
google.golang.org/api v0.284.0 // indirect
741741
google.golang.org/genproto v0.0.0-20260401024825-9d38bb4040a9 // indirect
742742
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
743743
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect

‎internal/edot/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
805805
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
806806
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
807807
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
808-
github.com/googleapis/enterprise-certificate-proxy v0.3.15 h1:xolVQTEXusUcAA5UgtyRLjelpFFHWlPQ4XfWGc7MBas=
809-
github.com/googleapis/enterprise-certificate-proxy v0.3.15/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
808+
github.com/googleapis/enterprise-certificate-proxy v0.3.16 h1:F/VPrx0YPBdksZJQdCAp0WUsqnNmZpUZszzfYt0M5Dw=
809+
github.com/googleapis/enterprise-certificate-proxy v0.3.16/go.mod h1:9Yb0eAkH/Xqhvv3zbeKf/+wMJqCeocWc6KIhDvEAuYE=
810810
github.com/googleapis/gax-go/v2 v2.22.0 h1:PjIWBpgGIVKGoCXuiCoP64altEJCj3/Ei+kSU5vlZD4=
811811
github.com/googleapis/gax-go/v2 v2.22.0/go.mod h1:irWBbALSr0Sk3qlqb9SyJ1h68WjgeFuiOzI4Rqw5+aY=
812812
github.com/gophercloud/gophercloud/v2 v2.11.1 h1:jCs4vLH8sJgRqrPzqVfWgl7uI6JnIIlsgeIRM0uHjxY=
@@ -2147,8 +2147,8 @@ golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhS
21472147
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
21482148
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
21492149
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
2150-
google.golang.org/api v0.279.0 h1:hsx2M2OaRcaKtVYK6vXEUnQvdjnend7ZYES+lYaot74=
2151-
google.golang.org/api v0.279.0/go.mod h1:B9TqLBwJqVjp1mtt7WeoQwWRwvu/400y5lETOql+giQ=
2150+
google.golang.org/api v0.284.0 h1:i+cKTgeQRcRySkP7QTl5PDO7/pAm8EcMFIUMlNbk4Vc=
2151+
google.golang.org/api v0.284.0/go.mod h1:AU44fU+XVZOCcd8uLaBIa/ZgzgPf/0qqY3+m7lQaado=
21522152
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
21532153
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
21542154
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

0 commit comments

Comments
 (0)