Skip to content

Commit e85d8bf

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
build(deps): bump github.com/gofrs/uuid/v5 from 5.3.2 to 5.4.0 (#5803)
* build(deps): bump github.com/gofrs/uuid/v5 from 5.3.2 to 5.4.0 Bumps [github.com/gofrs/uuid/v5](https://github.com/gofrs/uuid) from 5.3.2 to 5.4.0. - [Release notes](https://github.com/gofrs/uuid/releases) - [Commits](gofrs/uuid@v5.3.2...v5.4.0) --- updated-dependencies: - dependency-name: github.com/gofrs/uuid/v5 dependency-version: 5.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 3ace395) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum
1 parent fd03361 commit e85d8bf

File tree

6 files changed

+30
-3
lines changed

6 files changed

+30
-3
lines changed

NOTICE-fips.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,12 +1534,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15341534

15351535

15361536
--------------------------------------------------------------------------------
1537+
<<<<<<< HEAD
15371538
Dependency : github.com/gofrs/uuid
15381539
Version: v4.4.0+incompatible
15391540
Licence type (autodetected): MIT
15401541
--------------------------------------------------------------------------------
15411542

15421543
Contents 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

15441553
Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>
15451554

NOTICE.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,12 +1534,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15341534

15351535

15361536
--------------------------------------------------------------------------------
1537+
<<<<<<< HEAD
15371538
Dependency : github.com/gofrs/uuid
15381539
Version: v4.4.0+incompatible
15391540
Licence type (autodetected): MIT
15401541
--------------------------------------------------------------------------------
15411542

15421543
Contents 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

15441553
Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>
15451554

go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff 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

go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,15 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
7070
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
7171
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
7272
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
73+
<<<<<<< HEAD
7374
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
7475
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
7576
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
7677
github.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))
7782
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
7883
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
7984
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=

testing/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

testing/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
7171
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
7272
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
7373
github.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=
7676
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
7777
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
7878
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

0 commit comments

Comments
 (0)