From 7c52b80e7d711f9c2651e8e819971ea3706856c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 May 2026 14:24:00 +0200 Subject: [PATCH 1/2] build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100) * build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.2.5 to 5.3.0. - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-chi/chi/compare/v5.2.5...v5.3.0) --- updated-dependencies: - dependency-name: github.com/go-chi/chi/v5 dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] (cherry picked from commit cfc925778a1e310f00db32cc3c621ae0352534fe) # Conflicts: # go.mod # go.sum --- NOTICE-fips.txt | 4 ++-- NOTICE.txt | 4 ++-- go.mod | 5 +++++ go.sum | 7 +++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 75f7e52b9a..2ab665dc71 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -1535,11 +1535,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/go-chi/chi/v5 -Version: v5.2.5 +Version: v5.3.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.2.5/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.3.0/LICENSE: Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc. diff --git a/NOTICE.txt b/NOTICE.txt index bab43619db..a6475188fe 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1535,11 +1535,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/go-chi/chi/v5 -Version: v5.2.5 +Version: v5.3.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.2.5/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.3.0/LICENSE: Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc. diff --git a/go.mod b/go.mod index 5c24133e13..f700ee3fd1 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,13 @@ require ( github.com/elastic/elastic-agent-system-metrics v0.14.3 github.com/elastic/go-elasticsearch/v8 v8.19.5 github.com/elastic/go-ucfg v0.9.1 +<<<<<<< HEAD github.com/fxamacker/cbor/v2 v2.9.1 github.com/go-chi/chi/v5 v5.2.5 +======= + github.com/fxamacker/cbor/v2 v2.9.2 + github.com/go-chi/chi/v5 v5.3.0 +>>>>>>> cfc9257 (build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100)) github.com/gofrs/uuid/v5 v5.4.0 github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-cleanhttp v0.5.2 diff --git a/go.sum b/go.sum index 6532a8a353..0777280257 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.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ= github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= +======= +github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78= +github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM= +github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto= +>>>>>>> cfc9257 (build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100)) github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= From f1a87bfd6a8577862d821f8eb44d1d4bf0ec6dfd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 25 May 2026 12:34:15 +0000 Subject: [PATCH 2/2] fix: resolve backport merge conflict in go.mod and go.sum Agent-Logs-Url: https://github.com/elastic/fleet-server/sessions/1c12e785-0f46-45c5-bdb5-433192a90e55 Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com> --- go.mod | 5 ----- go.sum | 7 ------- 2 files changed, 12 deletions(-) diff --git a/go.mod b/go.mod index f700ee3fd1..c493c0f558 100644 --- a/go.mod +++ b/go.mod @@ -12,13 +12,8 @@ require ( github.com/elastic/elastic-agent-system-metrics v0.14.3 github.com/elastic/go-elasticsearch/v8 v8.19.5 github.com/elastic/go-ucfg v0.9.1 -<<<<<<< HEAD github.com/fxamacker/cbor/v2 v2.9.1 - github.com/go-chi/chi/v5 v5.2.5 -======= - github.com/fxamacker/cbor/v2 v2.9.2 github.com/go-chi/chi/v5 v5.3.0 ->>>>>>> cfc9257 (build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100)) github.com/gofrs/uuid/v5 v5.4.0 github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-cleanhttp v0.5.2 diff --git a/go.sum b/go.sum index 0777280257..7d29eb751f 100644 --- a/go.sum +++ b/go.sum @@ -57,17 +57,10 @@ 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.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ= github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= -github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= -github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= -======= -github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78= -github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM= github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto= ->>>>>>> cfc9257 (build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100)) github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=