Skip to content

Commit 7cefe40

Browse files
dependabot[bot]mergify[bot]
dependabot[bot]
authored and
mergify[bot]
committed
build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683)
* build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 Bumps google.golang.org/protobuf from 1.33.0 to 1.36.6. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 93c6b86) # Conflicts: # NOTICE.txt # go.mod # go.sum # testing/go.mod # testing/go.sum
1 parent 50639d3 commit 7cefe40

File tree

5 files changed

+47
-0
lines changed

5 files changed

+47
-0
lines changed

‎NOTICE.txt

+8
Original file line numberDiff line numberDiff line change
@@ -5323,11 +5323,19 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.63.2/LIC
53235323

53245324
--------------------------------------------------------------------------------
53255325
Dependency : google.golang.org/protobuf
5326+
<<<<<<< HEAD
53265327
Version: v1.33.0
53275328
Licence type (autodetected): BSD-3-Clause
53285329
--------------------------------------------------------------------------------
53295330

53305331
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.33.0/LICENSE:
5332+
=======
5333+
Version: v1.36.6
5334+
Licence type (autodetected): BSD-3-Clause
5335+
--------------------------------------------------------------------------------
5336+
5337+
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.36.6/LICENSE:
5338+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
53315339

53325340
Copyright (c) 2018 The Go Authors. All rights reserved.
53335341

‎go.mod

+5
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,13 @@ require (
3939
go.uber.org/zap v1.27.0
4040
golang.org/x/sync v0.12.0
4141
golang.org/x/time v0.11.0
42+
<<<<<<< HEAD
4243
google.golang.org/grpc v1.63.2
4344
google.golang.org/protobuf v1.33.0
45+
=======
46+
google.golang.org/grpc v1.71.0
47+
google.golang.org/protobuf v1.36.6
48+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
4449
gopkg.in/yaml.v3 v3.0.1
4550
)
4651

‎go.sum

+9
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,21 @@ golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
277277
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
278278
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
279279
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
280+
<<<<<<< HEAD
280281
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
281282
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
282283
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
283284
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
284285
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
285286
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
287+
=======
288+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
289+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
290+
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
291+
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
292+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
293+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
294+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
286295
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
287296
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
288297
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎testing/go.mod

+13
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ require (
6363
github.com/tklauser/numcpus v0.6.1 // indirect
6464
github.com/yusufpapurcu/wmi v1.2.4 // indirect
6565
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
66+
<<<<<<< HEAD
6667
go.opentelemetry.io/otel v1.28.0 // indirect
6768
go.opentelemetry.io/otel/metric v1.28.0 // indirect
6869
go.opentelemetry.io/otel/trace v1.28.0 // indirect
@@ -76,5 +77,17 @@ require (
7677
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
7778
google.golang.org/grpc v1.63.2 // indirect
7879
google.golang.org/protobuf v1.33.0 // indirect
80+
=======
81+
go.opentelemetry.io/otel v1.34.0 // indirect
82+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
84+
golang.org/x/crypto v0.36.0 // indirect
85+
golang.org/x/net v0.37.0 // indirect
86+
golang.org/x/sys v0.31.0 // indirect
87+
golang.org/x/text v0.23.0 // indirect
88+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
89+
google.golang.org/grpc v1.71.0 // indirect
90+
google.golang.org/protobuf v1.36.6 // indirect
91+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
7992
gopkg.in/yaml.v3 v3.0.1 // indirect
8093
)

‎testing/go.sum

+12
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
233233
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
234234
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
235235
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
236+
<<<<<<< HEAD
236237
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
237238
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0=
238239
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
@@ -242,6 +243,17 @@ google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
242243
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
243244
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
244245
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
246+
=======
247+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg=
248+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
249+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
250+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
251+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
252+
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
253+
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
254+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
255+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
256+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
245257
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
246258
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
247259
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

0 commit comments

Comments
 (0)