Skip to content

Commit ae9a6eb

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
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 d2ec62e commit ae9a6eb

File tree

5 files changed

+463
-0
lines changed

5 files changed

+463
-0
lines changed

NOTICE.txt

+108
Original file line numberDiff line numberDiff line change
@@ -2838,8 +2838,116 @@ Contents of probable licence file $GOMODCACHE/cloud.google.com/go@v0.110.4/LICEN
28382838

28392839

28402840
--------------------------------------------------------------------------------
2841+
<<<<<<< HEAD
28412842
Dependency : cloud.google.com/go/bigquery
28422843
Version: v1.52.0
2844+
=======
2845+
Dependency : google.golang.org/protobuf
2846+
Version: v1.36.6
2847+
Licence type (autodetected): BSD-3-Clause
2848+
--------------------------------------------------------------------------------
2849+
2850+
Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.36.6/LICENSE:
2851+
2852+
Copyright (c) 2018 The Go Authors. All rights reserved.
2853+
2854+
Redistribution and use in source and binary forms, with or without
2855+
modification, are permitted provided that the following conditions are
2856+
met:
2857+
2858+
* Redistributions of source code must retain the above copyright
2859+
notice, this list of conditions and the following disclaimer.
2860+
* Redistributions in binary form must reproduce the above
2861+
copyright notice, this list of conditions and the following disclaimer
2862+
in the documentation and/or other materials provided with the
2863+
distribution.
2864+
* Neither the name of Google Inc. nor the names of its
2865+
contributors may be used to endorse or promote products derived from
2866+
this software without specific prior written permission.
2867+
2868+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2869+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
2870+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
2871+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
2872+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
2873+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
2874+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
2875+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
2876+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2877+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2878+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2879+
2880+
2881+
--------------------------------------------------------------------------------
2882+
Dependency : gopkg.in/yaml.v3
2883+
Version: v3.0.1
2884+
Licence type (autodetected): MIT
2885+
--------------------------------------------------------------------------------
2886+
2887+
Contents of probable licence file $GOMODCACHE/gopkg.in/yaml.v3@v3.0.1/LICENSE:
2888+
2889+
2890+
This project is covered by two different licenses: MIT and Apache.
2891+
2892+
#### MIT License ####
2893+
2894+
The following files were ported to Go from C files of libyaml, and thus
2895+
are still covered by their original MIT license, with the additional
2896+
copyright staring in 2011 when the project was ported over:
2897+
2898+
apic.go emitterc.go parserc.go readerc.go scannerc.go
2899+
writerc.go yamlh.go yamlprivateh.go
2900+
2901+
Copyright (c) 2006-2010 Kirill Simonov
2902+
Copyright (c) 2006-2011 Kirill Simonov
2903+
2904+
Permission is hereby granted, free of charge, to any person obtaining a copy of
2905+
this software and associated documentation files (the "Software"), to deal in
2906+
the Software without restriction, including without limitation the rights to
2907+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
2908+
of the Software, and to permit persons to whom the Software is furnished to do
2909+
so, subject to the following conditions:
2910+
2911+
The above copyright notice and this permission notice shall be included in all
2912+
copies or substantial portions of the Software.
2913+
2914+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2915+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2916+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2917+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2918+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2919+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2920+
SOFTWARE.
2921+
2922+
### Apache License ###
2923+
2924+
All the remaining project files are covered by the Apache license:
2925+
2926+
Copyright (c) 2011-2019 Canonical Ltd
2927+
2928+
Licensed under the Apache License, Version 2.0 (the "License");
2929+
you may not use this file except in compliance with the License.
2930+
You may obtain a copy of the License at
2931+
2932+
http://www.apache.org/licenses/LICENSE-2.0
2933+
2934+
Unless required by applicable law or agreed to in writing, software
2935+
distributed under the License is distributed on an "AS IS" BASIS,
2936+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2937+
See the License for the specific language governing permissions and
2938+
limitations under the License.
2939+
2940+
2941+
2942+
2943+
================================================================================
2944+
Indirect dependencies
2945+
2946+
2947+
--------------------------------------------------------------------------------
2948+
Dependency : cel.dev/expr
2949+
Version: v0.19.1
2950+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
28432951
Licence type (autodetected): Apache-2.0
28442952
--------------------------------------------------------------------------------
28452953

go.mod

+8
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,16 @@ require (
2424
github.com/spf13/cobra v1.7.0
2525
github.com/stretchr/testify v1.8.4
2626
go.uber.org/zap v1.27.0
27+
<<<<<<< HEAD
2728
golang.org/x/sync v0.10.0
2829
golang.org/x/time v0.5.0
30+
=======
31+
golang.org/x/sync v0.12.0
32+
golang.org/x/time v0.11.0
33+
google.golang.org/grpc v1.71.0
34+
google.golang.org/protobuf v1.36.6
35+
gopkg.in/yaml.v3 v3.0.1
36+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
2937
)
3038

3139
require (

go.sum

+9
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,22 @@ golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ
221221
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
222222
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
223223
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
224+
<<<<<<< HEAD
224225
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
225226
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
226227
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
227228
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
228229
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
229230
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
230231
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
232+
=======
233+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
234+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
235+
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
236+
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
237+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
238+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
239+
>>>>>>> 93c6b86 (build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 (#4683))
231240
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
232241
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
233242
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

testing/go.mod

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
module github.com/elastic/fleet-server/testing
2+
3+
go 1.24
4+
5+
toolchain go1.24.0
6+
7+
replace (
8+
github.com/elastic/fleet-server/pkg/api => ../pkg/api
9+
github.com/elastic/fleet-server/v7 => ../
10+
)
11+
12+
require (
13+
github.com/Shopify/toxiproxy v2.1.4+incompatible
14+
github.com/docker/docker v26.1.5+incompatible
15+
github.com/elastic/elastic-agent-client/v7 v7.17.1
16+
github.com/elastic/fleet-server/pkg/api v0.0.0-00010101000000-000000000000
17+
github.com/elastic/fleet-server/v7 v7.0.0-00010101000000-000000000000
18+
github.com/stretchr/testify v1.10.0
19+
github.com/testcontainers/testcontainers-go v0.31.0
20+
)
21+
22+
require (
23+
dario.cat/mergo v1.0.0 // indirect
24+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
25+
github.com/Microsoft/go-winio v0.6.2 // indirect
26+
github.com/Microsoft/hcsshim v0.11.7 // indirect
27+
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
28+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29+
github.com/containerd/containerd v1.7.27 // indirect
30+
github.com/containerd/log v0.1.0 // indirect
31+
github.com/containerd/platforms v0.2.1 // indirect
32+
github.com/cpuguy83/dockercfg v0.3.1 // indirect
33+
github.com/davecgh/go-spew v1.1.1 // indirect
34+
github.com/distribution/reference v0.6.0 // indirect
35+
github.com/docker/go-connections v0.5.0 // indirect
36+
github.com/docker/go-units v0.5.0 // indirect
37+
github.com/elastic/elastic-agent-libs v0.18.12 // indirect
38+
github.com/felixge/httpsnoop v1.0.4 // indirect
39+
github.com/go-logr/logr v1.4.2 // indirect
40+
github.com/go-logr/stdr v1.2.2 // indirect
41+
github.com/go-ole/go-ole v1.3.0 // indirect
42+
github.com/gogo/protobuf v1.3.2 // indirect
43+
github.com/golang/protobuf v1.5.4 // indirect
44+
github.com/google/uuid v1.6.0 // indirect
45+
github.com/klauspost/compress v1.16.7 // indirect
46+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
47+
github.com/magiconair/properties v1.8.7 // indirect
48+
github.com/moby/docker-image-spec v1.3.1 // indirect
49+
github.com/moby/patternmatcher v0.6.0 // indirect
50+
github.com/moby/sys/sequential v0.5.0 // indirect
51+
github.com/moby/sys/user v0.3.0 // indirect
52+
github.com/moby/sys/userns v0.1.0 // indirect
53+
github.com/moby/term v0.5.0 // indirect
54+
github.com/morikuni/aec v1.0.0 // indirect
55+
github.com/oapi-codegen/runtime v1.1.1 // indirect
56+
github.com/opencontainers/go-digest v1.0.0 // indirect
57+
github.com/opencontainers/image-spec v1.1.0 // indirect
58+
github.com/pkg/errors v0.9.1 // indirect
59+
github.com/pmezard/go-difflib v1.0.0 // indirect
60+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
61+
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
62+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
63+
github.com/sirupsen/logrus v1.9.3 // indirect
64+
github.com/tklauser/go-sysconf v0.3.12 // indirect
65+
github.com/tklauser/numcpus v0.6.1 // indirect
66+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
67+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
68+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
69+
go.opentelemetry.io/otel v1.34.0 // indirect
70+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
71+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
72+
golang.org/x/crypto v0.36.0 // indirect
73+
golang.org/x/net v0.37.0 // indirect
74+
golang.org/x/sys v0.31.0 // indirect
75+
golang.org/x/text v0.23.0 // indirect
76+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
77+
google.golang.org/grpc v1.71.0 // indirect
78+
google.golang.org/protobuf v1.36.6 // indirect
79+
gopkg.in/yaml.v3 v3.0.1 // indirect
80+
)

0 commit comments

Comments
 (0)