diff --git a/config/reader/json/json.go b/config/reader/json/json.go index 82406559d1..09afa3a002 100644 --- a/config/reader/json/json.go +++ b/config/reader/json/json.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/imdario/mergo" + "dario.cat/mergo" "go-micro.dev/v5/config/encoder" "go-micro.dev/v5/config/encoder/json" "go-micro.dev/v5/config/reader" diff --git a/config/source/cli/cli.go b/config/source/cli/cli.go index c9b6474ed4..98a8334796 100644 --- a/config/source/cli/cli.go +++ b/config/source/cli/cli.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/imdario/mergo" + "dario.cat/mergo" "github.com/urfave/cli/v2" "go-micro.dev/v5/cmd" "go-micro.dev/v5/config/source" diff --git a/config/source/env/env.go b/config/source/env/env.go index d7c11fd0a7..e31aa8775d 100644 --- a/config/source/env/env.go +++ b/config/source/env/env.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/imdario/mergo" + "dario.cat/mergo" "go-micro.dev/v5/config/source" ) diff --git a/config/source/flag/flag.go b/config/source/flag/flag.go index c824e2257c..9dbc4208bf 100644 --- a/config/source/flag/flag.go +++ b/config/source/flag/flag.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/imdario/mergo" + "dario.cat/mergo" "go-micro.dev/v5/config/source" ) diff --git a/go.mod b/go.mod index d87bd28bc1..589abcfa11 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.24 toolchain go1.24.1 require ( + dario.cat/mergo v1.0.2 github.com/bitly/go-simplejson v0.5.0 github.com/cornelk/hashmap v1.0.8 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc @@ -15,7 +16,6 @@ require ( github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/hashicorp/consul/api v1.32.1 - github.com/imdario/mergo v0.3.13 github.com/jackc/pgx/v4 v4.18.3 github.com/kr/pretty v0.3.1 github.com/lib/pq v1.10.9 diff --git a/go.sum b/go.sum index e114aa1d3a..6e0c3b0535 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= +dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -141,8 +143,6 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -519,7 +519,6 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=