From e233f56b73c6567d85b887cd5e063b7ab7406257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Thu, 27 Apr 2023 13:14:20 +0200 Subject: [PATCH] chore: use github.com/evanphx/json-patch/v5 (#7015) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché --- go.mod | 2 +- pkg/utils/json/patch.go | 2 +- pkg/utils/json/utils_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 63a0dad282..d7068507af 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ require ( github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 github.com/cyphar/filepath-securejoin v0.2.3 github.com/distribution/distribution v2.8.1+incompatible - github.com/evanphx/json-patch v5.6.0+incompatible github.com/evanphx/json-patch/v5 v5.6.0 github.com/fatih/color v1.15.0 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 @@ -157,6 +156,7 @@ require ( github.com/emicklei/go-restful/v3 v3.10.2 // indirect github.com/emicklei/proto v1.11.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect diff --git a/pkg/utils/json/patch.go b/pkg/utils/json/patch.go index 1fe0ec27ea..7c2631c555 100644 --- a/pkg/utils/json/patch.go +++ b/pkg/utils/json/patch.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" ) type PatchOperation struct { diff --git a/pkg/utils/json/utils_test.go b/pkg/utils/json/utils_test.go index 332dff89dc..e3726bf6f2 100644 --- a/pkg/utils/json/utils_test.go +++ b/pkg/utils/json/utils_test.go @@ -3,7 +3,7 @@ package json import ( "testing" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" "gotest.tools/assert" )