From 7d5745b483a1e3759a45f2f7156fcec138c3d136 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Thu, 26 Oct 2023 09:39:50 -0400 Subject: [PATCH] Resolve conflicts. --- NOTICE.txt | 44 ++------------------------------------------ go.mod | 20 +++----------------- go.sum | 11 ++--------- 3 files changed, 7 insertions(+), 68 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 41f9dc6a7ce..79e63ea7a84 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6372,46 +6372,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -<<<<<<< HEAD -======= -Dependency : golang.org/x/term -Version: v0.13.0 -Licence type (autodetected): BSD-3-Clause --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.13.0/LICENSE: - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - --------------------------------------------------------------------------------- ->>>>>>> 872f329c29 (Bump github.com/elastic/elastic-agent-libs from 0.6.0 to 0.6.2 (#3660)) Dependency : golang.org/x/text Version: v0.13.0 Licence type (autodetected): BSD-3-Clause @@ -17351,11 +17311,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/term -Version: v0.10.0 +Version: v0.13.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.10.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.13.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index d7bf35873f9..cfcfc93a206 100644 --- a/go.mod +++ b/go.mod @@ -15,13 +15,8 @@ require ( github.com/elastic/e2e-testing v1.1.0 github.com/elastic/elastic-agent-autodiscover v0.6.4 github.com/elastic/elastic-agent-client/v7 v7.4.0 -<<<<<<< HEAD - github.com/elastic/elastic-agent-libs v0.6.0 - github.com/elastic/elastic-agent-system-metrics v0.6.1 -======= github.com/elastic/elastic-agent-libs v0.6.2 - github.com/elastic/elastic-agent-system-metrics v0.7.0 ->>>>>>> 872f329c29 (Bump github.com/elastic/elastic-agent-libs from 0.6.0 to 0.6.2 (#3660)) + github.com/elastic/elastic-agent-system-metrics v0.6.1 github.com/elastic/elastic-transport-go/v8 v8.3.0 github.com/elastic/go-elasticsearch/v8 v8.10.0 github.com/elastic/go-licenser v0.4.1 @@ -58,21 +53,12 @@ require ( go.elastic.co/ecszap v1.0.1 go.elastic.co/go-licence-detector v0.5.0 go.uber.org/zap v1.25.0 -<<<<<<< HEAD - golang.org/x/crypto v0.11.0 - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e - golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/sync v0.3.0 - golang.org/x/sys v0.10.0 - golang.org/x/text v0.11.0 -======= golang.org/x/crypto v0.14.0 + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/sync v0.3.0 golang.org/x/sys v0.13.0 - golang.org/x/term v0.13.0 golang.org/x/text v0.13.0 ->>>>>>> 872f329c29 (Bump github.com/elastic/elastic-agent-libs from 0.6.0 to 0.6.2 (#3660)) golang.org/x/time v0.3.0 golang.org/x/tools v0.7.0 google.golang.org/grpc v1.58.3 @@ -159,7 +145,7 @@ require ( golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect - golang.org/x/term v0.10.0 // indirect + golang.org/x/term v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/grpc/examples v0.0.0-20220304170021-431ea809a767 // indirect diff --git a/go.sum b/go.sum index b6288a76b83..891f4e7bf7e 100644 --- a/go.sum +++ b/go.sum @@ -780,17 +780,10 @@ github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+e github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= github.com/elastic/elastic-agent-client/v7 v7.4.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0= -<<<<<<< HEAD -github.com/elastic/elastic-agent-libs v0.6.0 h1:HnL/OpAzIHlK8y1J69XQuAx4tlCzd6e2kldMHvXARvY= -github.com/elastic/elastic-agent-libs v0.6.0/go.mod h1:K6U+n84siZ66ZyG36h1/x+fw1oIZbFXEypAC6KSiFOg= -github.com/elastic/elastic-agent-system-metrics v0.6.1 h1:LCN1lvQTkdUuU/rKlpKyVMDU/G/I8/iZWCaW6K+mo4o= -github.com/elastic/elastic-agent-system-metrics v0.6.1/go.mod h1:Bj8XM/uNKm553blQHkGNEICRLGnVEtw8yttmV5vBngA= -======= github.com/elastic/elastic-agent-libs v0.6.2 h1:tE5pFK4y7xm1FtXm+r+63G7STjJAaWh3+oKIQDzdPDo= github.com/elastic/elastic-agent-libs v0.6.2/go.mod h1:o+EySawBZGeYu49shJxerg2wRCimS1dhrD4As0MS700= -github.com/elastic/elastic-agent-system-metrics v0.7.0 h1:qDLY30UDforSd/TfHfqUDiiHSL6Nu6qLXHsKSxz4OuQ= -github.com/elastic/elastic-agent-system-metrics v0.7.0/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= ->>>>>>> 872f329c29 (Bump github.com/elastic/elastic-agent-libs from 0.6.0 to 0.6.2 (#3660)) +github.com/elastic/elastic-agent-system-metrics v0.6.1 h1:LCN1lvQTkdUuU/rKlpKyVMDU/G/I8/iZWCaW6K+mo4o= +github.com/elastic/elastic-agent-system-metrics v0.6.1/go.mod h1:Bj8XM/uNKm553blQHkGNEICRLGnVEtw8yttmV5vBngA= github.com/elastic/elastic-integration-corpus-generator-tool v0.5.0/go.mod h1:uf9N86y+UACGybdEhZLpwZ93XHWVhsYZAA4c2T2v6YM= github.com/elastic/elastic-package v0.77.0/go.mod h1:Xeqx0OOVnKBfFoSHsHmKI74RxgRGiDhU6yXEu8BkJJM= github.com/elastic/elastic-transport-go/v8 v8.0.0-20230329154755-1a3c63de0db6/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI=