From 42625924fb15be5de2141cea1c047a69e98c2f94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:56:15 +0000 Subject: [PATCH 1/2] fix(deps): update module github.com/imdario/mergo to v1 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 201dcf231e..02df90fb1b 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/hashicorp/vault/api v1.15.0 github.com/hashicorp/vault/api/auth/approle v0.8.0 github.com/iancoleman/orderedmap v0.2.0 - github.com/imdario/mergo v0.3.15 + github.com/imdario/mergo v1.0.1 github.com/influxdata/influxdb-client-go/v2 v2.13.0 github.com/jarcoal/httpmock v1.0.8 github.com/magiconair/properties v1.8.7 From b266ebf23f3f3a58df161aa985f46a9154739dcf Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Thu, 23 Jan 2025 12:06:54 +0100 Subject: [PATCH 2/2] Fix 'module declares its path as: dario.cat/mergo but was required as: github.com/imdario/mergo' --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 02df90fb1b..3b2c473dab 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/SAP/jenkins-library go 1.23.4 +replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 + require ( cloud.google.com/go/pubsub v1.36.1 cloud.google.com/go/storage v1.38.0 diff --git a/go.sum b/go.sum index b1b74d16d8..dfd3cc8462 100644 --- a/go.sum +++ b/go.sum @@ -598,8 +598,8 @@ github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= -github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=