Skip to content

Commit

Permalink
[8.9](backport #36431) Upgrade elastic-agent-libs to v0.3.13 (#36437)
Browse files Browse the repository at this point in the history 
* Upgrade elastic-agent-libs to v0.3.13 (#36431)

- Update elastic-agent-libs to v0.3.13
- Run go mod tidy

(cherry picked from commit 430f094)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum

* fix merge conflicts

---------

Co-authored-by: Tiago Queiroz <[email protected]>
  • Loading branch information
@mergify @belimawr
mergify[bot] and belimawr authored Aug 31, 2023
1 parent d355dd5 commit 64d990d
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 137 deletions.
28 changes: 14 additions & 14 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12712,11 +12712,11 @@ SOFTWARE

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-libs
Version: v0.3.9
Version: v0.3.13
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].9/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].13/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -17038,11 +17038,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/gofrs/uuid
Version: v4.2.0+incompatible
Version: v4.4.0+incompatible
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid@v4.2.0+incompatible/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid@v4.4.0+incompatible/LICENSE:

Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>

Expand Down Expand Up @@ -22265,11 +22265,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/spf13/cobra
Version: v1.3.0
Version: v1.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/spf13/cobra@v1.3.0/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/spf13/cobra@v1.7.0/LICENSE.txt:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -24801,11 +24801,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.7.0
Version: v0.9.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.7.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.9.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -39683,11 +39683,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice

--------------------------------------------------------------------------------
Dependency : github.com/hashicorp/go-hclog
Version: v1.0.0
Version: v0.12.2
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-hclog@v1.0.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-hclog@v0.12.2/LICENSE:

MIT License

Expand Down Expand Up @@ -40862,11 +40862,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/inconshreveable/mousetrap
Version: v1.0.1
Version: v1.1.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/inconshreveable/mousetrap@v1.0.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/inconshreveable/mousetrap@v1.1.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -49158,11 +49158,11 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg/[email protected]/L

--------------------------------------------------------------------------------
Dependency : github.com/youmark/pkcs8
Version: v0.0.0-20181117223130-1be2e3e5546d
Version: v0.0.0-20201027041543-1326539a0a0a
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/youmark/[email protected]20181117223130-1be2e3e5546d/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/youmark/[email protected]20201027041543-1326539a0a0a/LICENSE:

The MIT License (MIT)

Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ require (
github.com/godbus/dbus/v5 v5.0.6
github.com/godror/godror v0.33.2
github.com/gofrs/flock v0.8.1
github.com/gofrs/uuid v4.2.0+incompatible
github.com/gofrs/uuid v4.4.0+incompatible
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
Expand Down Expand Up @@ -138,7 +138,7 @@ require (
github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54
github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cobra v1.3.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.2
github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b
Expand All @@ -158,7 +158,7 @@ require (
golang.org/x/net v0.9.0
golang.org/x/oauth2 v0.7.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.7.0
golang.org/x/sys v0.9.0
golang.org/x/text v0.9.0
golang.org/x/time v0.3.0
golang.org/x/tools v0.6.0
Expand Down Expand Up @@ -202,7 +202,7 @@ require (
github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20220623125934-28468a6701b5
github.com/elastic/bayeux v1.0.5
github.com/elastic/elastic-agent-autodiscover v0.6.2
github.com/elastic/elastic-agent-libs v0.3.9
github.com/elastic/elastic-agent-libs v0.3.13
github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3
github.com/elastic/elastic-agent-system-metrics v0.6.1
github.com/elastic/go-elasticsearch/v8 v8.8.1
Expand Down Expand Up @@ -292,7 +292,7 @@ require (
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jcchavezs/porto v0.1.0 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
Expand Down Expand Up @@ -343,7 +343,7 @@ require (
github.com/xdg-go/scram v1.0.2 // indirect
github.com/xdg-go/stringprep v1.0.2 // indirect
github.com/xdg/stringprep v1.0.3 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
Expand Down
Loading

0 comments on commit 64d990d

Please sign in to comment.