Skip to content

Commit f781272

Browse files
authored
Use the module version of json-patch v5 (#381)
This matches other dependencies and means the non-modular dependency can be entirely dropped. Signed-off-by: Stephen Kitt <[email protected]>
1 parent ade1c7c commit f781272

File tree

10 files changed

+2
-1592
lines changed

10 files changed

+2
-1592
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module open-cluster-management.io/api
33
go 1.23.6
44

55
require (
6-
github.com/evanphx/json-patch v5.6.0+incompatible
6+
github.com/evanphx/json-patch/v5 v5.9.11
77
github.com/gogo/protobuf v1.3.2
88
github.com/onsi/ginkgo v1.16.5
99
github.com/onsi/gomega v1.36.1
@@ -25,7 +25,6 @@ require (
2525
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2727
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
28-
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2928
github.com/fsnotify/fsnotify v1.7.0 // indirect
3029
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3130
github.com/go-logr/logr v1.4.2 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
1212
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1313
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
1414
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
15-
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
16-
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
1715
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
1816
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
1917
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

utils/work/v1/workapplier/workapplier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
99
"k8s.io/apimachinery/pkg/runtime"
1010

11-
jsonpatch "github.com/evanphx/json-patch"
11+
jsonpatch "github.com/evanphx/json-patch/v5"
1212
"k8s.io/apimachinery/pkg/api/equality"
1313
"k8s.io/apimachinery/pkg/api/errors"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

vendor/github.com/evanphx/json-patch/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

vendor/github.com/evanphx/json-patch/LICENSE

Lines changed: 0 additions & 25 deletions
This file was deleted.

vendor/github.com/evanphx/json-patch/README.md

Lines changed: 0 additions & 317 deletions
This file was deleted.

0 commit comments

Comments
 (0)