Skip to content

Commit b50f81d

Browse files
authored
chore: [releases/0.34] cherry-pick and version fix (#1713)
open-component-model/ocm-project#783 (comment) --------- Signed-off-by: Frederic Wilhelm <frederic.wilhelm@sap.com>
1 parent 275a4ba commit b50f81d

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.34.0-dev
1+
0.34.1-dev

api/utils/subst/subst.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
mlog "github.com/mandelsoft/logging"
1111
"github.com/mandelsoft/vfs/pkg/vfs"
1212
"github.com/mikefarah/yq/v4/pkg/yqlib"
13-
"go.yaml.in/yaml/v4"
13+
"go.yaml.in/yaml/v3"
1414
glog "gopkg.in/op/go-logging.v1"
1515

1616
"ocm.software/ocm/api/utils"

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/mandelsoft/spiff v1.7.0-beta-7
4848
github.com/mandelsoft/vfs v0.4.4
4949
github.com/marstr/guid v1.1.0
50-
github.com/mikefarah/yq/v4 v4.48.2
50+
github.com/mikefarah/yq/v4 v4.48.1
5151
github.com/mitchellh/copystructure v1.2.0
5252
github.com/mittwald/go-helm-client v0.12.18
5353
github.com/moby/locker v1.0.1
@@ -72,7 +72,7 @@ require (
7272
github.com/tonglil/buflogr v1.1.1
7373
github.com/ulikunitz/xz v0.5.15
7474
github.com/xeipuuv/gojsonschema v1.2.0
75-
go.yaml.in/yaml/v4 v4.0.0-rc.3
75+
go.yaml.in/yaml/v3 v3.0.4
7676
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
7777
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
7878
golang.org/x/net v0.47.0
@@ -521,7 +521,6 @@ require (
521521
go.uber.org/multierr v1.11.0 // indirect
522522
go.uber.org/zap v1.27.0 // indirect
523523
go.yaml.in/yaml/v2 v2.4.3 // indirect
524-
go.yaml.in/yaml/v3 v3.0.4 // indirect
525524
golang.org/x/crypto v0.45.0 // indirect
526525
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
527526
golang.org/x/mod v0.30.0 // indirect

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,8 +1697,8 @@ github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
16971697
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
16981698
github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
16991699
github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
1700-
github.com/mikefarah/yq/v4 v4.48.2 h1:loHcgZ3Soa4ZxR4QafZ6Xr6GU8hWuSr1A8ziTLjpHlI=
1701-
github.com/mikefarah/yq/v4 v4.48.2/go.mod h1:iHgYxHyqA6VqQfre+TocMnqnk7e2+pNzAHusH8y95Wk=
1700+
github.com/mikefarah/yq/v4 v4.48.1 h1:xfw9oDxur6z+friOtMAuzSvQ9LPLb0LRDsl1e36DGCo=
1701+
github.com/mikefarah/yq/v4 v4.48.1/go.mod h1:NbCTmYAY+KjwCZemVDqLxSAeZKjXFK04lgIiSx13tD0=
17021702
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
17031703
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
17041704
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
@@ -2205,8 +2205,6 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
22052205
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
22062206
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
22072207
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
2208-
go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=
2209-
go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
22102208
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
22112209
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
22122210
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

0 commit comments

Comments
 (0)