Skip to content

Commit 786e2f5

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #724 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 29b090b + 7eb1987 commit 786e2f5

8 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/spf13/pflag v1.0.10
3131
github.com/stretchr/testify v1.11.1
3232
go.podman.io/image/v5 v5.39.2
33-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358
33+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
3434
golang.org/x/mod v0.35.0
3535
golang.org/x/sync v0.20.0
3636
golang.org/x/tools v0.44.0
@@ -111,8 +111,8 @@ require (
111111
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
112112
github.com/go-errors/errors v1.5.1 // indirect
113113
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
114-
github.com/go-git/go-billy/v5 v5.8.0 // indirect
115-
github.com/go-git/go-git/v5 v5.18.0 // indirect
114+
github.com/go-git/go-billy/v5 v5.9.0 // indirect
115+
github.com/go-git/go-git/v5 v5.19.0 // indirect
116116
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
117117
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
118118
github.com/go-logr/stdr v1.2.2 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8b
159159
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
160160
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
161161
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
162-
github.com/go-git/go-billy/v5 v5.8.0 h1:I8hjc3LbBlXTtVuFNJuwYuMiHvQJDq1AT6u4DwDzZG0=
163-
github.com/go-git/go-billy/v5 v5.8.0/go.mod h1:RpvI/rw4Vr5QA+Z60c6d6LXH0rYJo0uD5SqfmrrheCY=
164-
github.com/go-git/go-git/v5 v5.18.0 h1:O831KI+0PR51hM2kep6T8k+w0/LIAD490gvqMCvL5hM=
165-
github.com/go-git/go-git/v5 v5.18.0/go.mod h1:pW/VmeqkanRFqR6AljLcs7EA7FbZaN5MQqO7oZADXpo=
162+
github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA=
163+
github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw=
164+
github.com/go-git/go-git/v5 v5.19.0 h1:+WkVUQZSy/F1Gb13udrMKjIM2PrzsNfDKFSfo5tkMtc=
165+
github.com/go-git/go-git/v5 v5.19.0/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ=
166166
github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
167167
github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw=
168168
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
@@ -606,8 +606,8 @@ golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5
606606
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
607607
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
608608
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
609-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 h1:kpfSV7uLwKJbFSEgNhWzGSL47NDSF/5pYYQw1V0ub6c=
610-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358/go.mod h1:R3t0oliuryB5eenPWl3rrQxwnNM3WTwnsRZZiXLAAW8=
609+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
610+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
611611
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
612612
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
613613
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

‎openshift/tests-extension/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ require (
9494
go.yaml.in/yaml/v2 v2.4.4 // indirect
9595
go.yaml.in/yaml/v3 v3.0.4 // indirect
9696
golang.org/x/crypto v0.50.0 // indirect
97-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 // indirect
97+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
9898
golang.org/x/net v0.53.0 // indirect
9999
golang.org/x/oauth2 v0.36.0 // indirect
100100
golang.org/x/sync v0.20.0 // indirect

‎openshift/tests-extension/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
231231
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
232232
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
233233
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
234-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358 h1:kpfSV7uLwKJbFSEgNhWzGSL47NDSF/5pYYQw1V0ub6c=
235-
golang.org/x/exp v0.0.0-20260209203927-2842357ff358/go.mod h1:R3t0oliuryB5eenPWl3rrQxwnNM3WTwnsRZZiXLAAW8=
234+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
235+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
236236
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
237237
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
238238
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

‎openshift/tests-extension/vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ golang.org/x/crypto/internal/alias
416416
golang.org/x/crypto/internal/poly1305
417417
golang.org/x/crypto/ssh
418418
golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
419-
# golang.org/x/exp v0.0.0-20260209203927-2842357ff358
420-
## explicit; go 1.24.0
419+
# golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
420+
## explicit; go 1.25.0
421421
golang.org/x/exp/slices
422422
# golang.org/x/net v0.53.0
423423
## explicit; go 1.25.0

‎requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ mergedeep==1.3.4
1616
mkdocs==1.6.1
1717
mkdocs-material==9.7.6
1818
mkdocs-material-extensions==1.3.1
19-
packaging==26.1
19+
packaging==26.2
2020
paginate==0.5.7
21-
pathspec==1.1.0
21+
pathspec==1.1.1
2222
platformdirs==4.9.6
2323
Pygments==2.20.0
2424
pymdown-extensions==10.21.2
@@ -31,5 +31,5 @@ regex==2026.4.4
3131
requests==2.33.1
3232
six==1.17.0
3333
soupsieve==2.8.3
34-
urllib3==2.6.3
34+
urllib3==2.7.0
3535
watchdog==6.0.0

‎vendor/github.com/go-git/go-billy/v5/README.md‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,11 @@ github.com/go-git/gcfg
301301
github.com/go-git/gcfg/scanner
302302
github.com/go-git/gcfg/token
303303
github.com/go-git/gcfg/types
304-
# github.com/go-git/go-billy/v5 v5.8.0
305-
## explicit; go 1.24.0
304+
# github.com/go-git/go-billy/v5 v5.9.0
305+
## explicit; go 1.25.0
306306
github.com/go-git/go-billy/v5
307-
# github.com/go-git/go-git/v5 v5.18.0
308-
## explicit; go 1.24.0
307+
# github.com/go-git/go-git/v5 v5.19.0
308+
## explicit; go 1.25.0
309309
github.com/go-git/go-git/v5/internal/path_util
310310
github.com/go-git/go-git/v5/plumbing/format/config
311311
github.com/go-git/go-git/v5/plumbing/format/gitignore
@@ -1021,8 +1021,8 @@ golang.org/x/crypto/openpgp/s2k
10211021
golang.org/x/crypto/pbkdf2
10221022
golang.org/x/crypto/salsa20/salsa
10231023
golang.org/x/crypto/scrypt
1024-
# golang.org/x/exp v0.0.0-20260209203927-2842357ff358
1025-
## explicit; go 1.24.0
1024+
# golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
1025+
## explicit; go 1.25.0
10261026
golang.org/x/exp/maps
10271027
golang.org/x/exp/slices
10281028
# golang.org/x/mod v0.35.0

0 commit comments

Comments
 (0)