diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 8d6055d10b..cd928235a8 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -1475,11 +1475,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.8/ -------------------------------------------------------------------------------- Dependency : github.com/fxamacker/cbor/v2 -Version: v2.8.0 +Version: v2.9.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/fxamacker/cbor/v2@v2.8.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/fxamacker/cbor/v2@v2.9.0/LICENSE: MIT License diff --git a/NOTICE.txt b/NOTICE.txt index d376c1620d..e6ef81b990 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1475,11 +1475,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.8/ -------------------------------------------------------------------------------- Dependency : github.com/fxamacker/cbor/v2 -Version: v2.8.0 +Version: v2.9.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/fxamacker/cbor/v2@v2.8.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/fxamacker/cbor/v2@v2.9.0/LICENSE: MIT License diff --git a/go.mod b/go.mod index f7622e02db..cd9823fd71 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,15 @@ require ( github.com/elastic/elastic-agent-system-metrics v0.11.15 github.com/elastic/go-elasticsearch/v8 v8.17.1 github.com/elastic/go-ucfg v0.8.8 +<<<<<<< HEAD github.com/fxamacker/cbor/v2 v2.8.0 github.com/go-chi/chi/v5 v5.2.1 github.com/gofrs/uuid v4.4.0+incompatible +======= + github.com/fxamacker/cbor/v2 v2.9.0 + github.com/go-chi/chi/v5 v5.2.2 + github.com/gofrs/uuid/v5 v5.3.2 +>>>>>>> 9ac161c (build(deps): bump github.com/fxamacker/cbor/v2 from 2.8.0 to 2.9.0 (#5156)) github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-version v1.7.0 diff --git a/go.sum b/go.sum index 2097c0b367..cb02260b25 100644 --- a/go.sum +++ b/go.sum @@ -57,10 +57,17 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +<<<<<<< HEAD github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU= github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8= github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= +======= +github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= +github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= +github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= +>>>>>>> 9ac161c (build(deps): bump github.com/fxamacker/cbor/v2 from 2.8.0 to 2.9.0 (#5156)) github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=