File tree Expand file tree Collapse file tree 6 files changed +30
-3
lines changed Expand file tree Collapse file tree 6 files changed +30
-3
lines changed Original file line number Diff line number Diff line change @@ -1534,12 +1534,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15341534
15351535
15361536--------------------------------------------------------------------------------
1537+ <<<<<<< HEAD
15371538Dependency : github.com/gofrs/uuid
15381539Version: v4.4.0+incompatible
15391540Licence type (autodetected): MIT
15401541--------------------------------------------------------------------------------
15411542
15421543Contents of probable licence file $GOMODCACHE/github.com/gofrs/
[email protected] +incompatible/LICENSE:
1544+ =======
1545+ Dependency : github.com/gofrs/uuid/v5
1546+ Version: v5.4.0
1547+ Licence type (autodetected): MIT
1548+ --------------------------------------------------------------------------------
1549+
1550+ Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/
[email protected] /LICENSE:
1551+ >>>>>>> 3ace395 (build(deps): bump github.com/gofrs/uuid/v5 from 5.3.2 to 5.4.0 (#5803))
15431552
15441553Copyright (C) 2013-2018 by Maxim Bublis <
[email protected] >
15451554
Original file line number Diff line number Diff line change @@ -1534,12 +1534,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15341534
15351535
15361536--------------------------------------------------------------------------------
1537+ <<<<<<< HEAD
15371538Dependency : github.com/gofrs/uuid
15381539Version: v4.4.0+incompatible
15391540Licence type (autodetected): MIT
15401541--------------------------------------------------------------------------------
15411542
15421543Contents of probable licence file $GOMODCACHE/github.com/gofrs/
[email protected] +incompatible/LICENSE:
1544+ =======
1545+ Dependency : github.com/gofrs/uuid/v5
1546+ Version: v5.4.0
1547+ Licence type (autodetected): MIT
1548+ --------------------------------------------------------------------------------
1549+
1550+ Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/
[email protected] /LICENSE:
1551+ >>>>>>> 3ace395 (build(deps): bump github.com/gofrs/uuid/v5 from 5.3.2 to 5.4.0 (#5803))
15431552
15441553Copyright (C) 2013-2018 by Maxim Bublis <
[email protected] >
15451554
Original file line number Diff line number Diff line change @@ -13,7 +13,11 @@ require (
1313 github.com/elastic/go-ucfg v0.8.8
1414 github.com/fxamacker/cbor/v2 v2.8.0
1515 github.com/go-chi/chi/v5 v5.2.3
16+ <<<<<<< HEAD
1617 github.com/gofrs/uuid v4.4.0+incompatible
18+ =======
19+ github.com/gofrs/uuid/v5 v5.4.0
20+ >>>>>>> 3ace395 (build(deps): bump github.com/gofrs/uuid/v5 from 5.3.2 to 5.4.0 (#5803))
1721 github.com/google/go-cmp v0.7.0
1822 github.com/hashicorp/go-cleanhttp v0.5.2
1923 github.com/hashicorp/go-version v1.7.0
Original file line number Diff line number Diff line change @@ -70,10 +70,15 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
7070github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE =
7171github.com/go-ole/go-ole v1.3.0 /go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78 =
7272github.com/godbus/dbus/v5 v5.0.4 /go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA =
73+ <<<<<<< HEAD
7374github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA =
7475github.com/gofrs/uuid v4.4.0+incompatible /go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM =
7576github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM =
7677github.com/gofrs/uuid/v5 v5.2.0 /go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8 =
78+ =======
79+ github.com/gofrs/uuid/v5 v5.4.0 h1:EfbpCTjqMuGyq5ZJwxqzn3Cbr2d0rUZU7v5ycAk/e/0 =
80+ github.com/gofrs/uuid/v5 v5.4.0 /go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8 =
81+ >>>>>>> 3ace395 (build(deps): bump github.com/gofrs/uuid/v5 from 5.3.2 to 5.4.0 (#5803))
7782github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q =
7883github.com/gogo/protobuf v1.3.2 /go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q =
7984github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek =
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ require (
1414 github.com/elastic/elastic-agent-libs v0.25.0
1515 github.com/elastic/fleet-server/pkg/api v0.0.0-00010101000000-000000000000
1616 github.com/elastic/fleet-server/v7 v7.0.0-00010101000000-000000000000
17- github.com/gofrs/uuid/v5 v5.3.2
17+ github.com/gofrs/uuid/v5 v5.4.0
1818 github.com/stretchr/testify v1.11.1
1919 github.com/testcontainers/testcontainers-go v0.39.0
2020 github.com/testcontainers/testcontainers-go/modules/toxiproxy v0.39.0
Original file line number Diff line number Diff line change @@ -71,8 +71,8 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
7171github.com/go-ole/go-ole v1.3.0 /go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78 =
7272github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI =
7373github.com/go-redis/redis/v8 v8.11.5 /go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo =
74- github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0 =
75- github.com/gofrs/uuid/v5 v5.3.2 /go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8 =
74+ github.com/gofrs/uuid/v5 v5.4.0 h1:EfbpCTjqMuGyq5ZJwxqzn3Cbr2d0rUZU7v5ycAk/e/0 =
75+ github.com/gofrs/uuid/v5 v5.4.0 /go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8 =
7676github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek =
7777github.com/golang/protobuf v1.5.4 /go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps =
7878github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8 =
You can’t perform that action at this time.
0 commit comments