diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 3380de8d11..d5025a8cac 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -711,11 +711,19 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs +<<<<<<< HEAD Version: v0.25.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.25.1/LICENSE: +======= +Version: v0.30.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.30.0/LICENSE: +>>>>>>> 05662d6c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.25.1 to 0.26.0 (#19462)) Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index a2f3b219cc..267c007cc5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -711,11 +711,19 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs +<<<<<<< HEAD Version: v0.25.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.25.1/LICENSE: +======= +Version: v0.30.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.30.0/LICENSE: +>>>>>>> 05662d6c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.25.1 to 0.26.0 (#19462)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 43e8b4bb94..cd94266043 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,11 @@ require ( github.com/elastic/apm-data v1.19.2 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251104200200-76e371455e81 github.com/elastic/elastic-agent-client/v7 v7.17.2 +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.25.1 +======= + github.com/elastic/elastic-agent-libs v0.30.0 +>>>>>>> 05662d6c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.25.1 to 0.26.0 (#19462)) github.com/elastic/elastic-agent-system-metrics v0.13.5 github.com/elastic/elastic-transport-go/v8 v8.8.0 github.com/elastic/gmux v0.3.2 diff --git a/go.sum b/go.sum index 3156cde85d..b6bfaed060 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,13 @@ github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQB github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE= github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA= github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk= +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.25.1 h1:PnLx7vidULw+Mx3PMQgf/mZ+yiGELPqn/Lx5KV3fAh4= github.com/elastic/elastic-agent-libs v0.25.1/go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A= +======= +github.com/elastic/elastic-agent-libs v0.30.0 h1:8MNjn24Y2bAH+NyGoDOpJs5USPnm/sn5CWLtneypWZ0= +github.com/elastic/elastic-agent-libs v0.30.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= +>>>>>>> 05662d6c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.25.1 to 0.26.0 (#19462)) github.com/elastic/elastic-agent-system-metrics v0.13.5 h1:VPTkk3C0ixsgqhAS2S++0/BKe+X6tYn+GzHbBLVuiO4= github.com/elastic/elastic-agent-system-metrics v0.13.5/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA= github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=