This is an automated email from the ASF dual-hosted git repository.
AlexStocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new 484ff8fee build: upgrade direct YAML usage to go.yaml.in/yaml/v4
(#3586)
484ff8fee is described below
commit 484ff8fee648986a514e13f3b20f6b2b4a43bc83
Author: dev_Hakaze <[email protected]>
AuthorDate: Sun Aug 2 17:35:05 2026 +0700
build: upgrade direct YAML usage to go.yaml.in/yaml/v4 (#3586)
* build: upgrade direct YAML usage to go.yaml.in/yaml/v4
Replace main-module imports of gopkg.in/yaml.v3 with go.yaml.in/yaml/v4
for config center, routers, REST/gRPC/Getty config, and Triple OpenAPI
encoding. Direct dependency is now go.yaml.in/yaml/v4; gopkg.in/yaml.v3
remains only as a transitive (indirect) dependency.
Fixes: #3582
Signed-off-by: arimu1 <[email protected]>
* style: fix go.yaml.in import order in grpc client
make check-fmt / imports-formatter requires go.yaml.in/yaml/v4 before
google.golang.org imports in protocol/grpc/client.go.
Signed-off-by: arimu1 <[email protected]>
* ci: re-trigger integration test after 6h timeout
---------
Signed-off-by: arimu1 <[email protected]>
Co-authored-by: arimu1 <[email protected]>
---
cluster/router/affinity/router.go | 2 +-
cluster/router/condition/dynamic_router.go | 2 +-
cluster/router/condition/route.go | 2 +-
cluster/router/script/router.go | 2 +-
cluster/router/tag/router.go | 2 +-
config_center/apollo/impl.go | 2 +-
config_center/apollo/listener.go | 2 +-
config_center/mock_dynamic_config.go | 2 +-
config_center/parser/configuration_parser.go | 2 +-
go.mod | 3 ++-
go.sum | 2 ++
protocol/grpc/client.go | 4 ++--
protocol/rest/config/reader/rest_config_reader.go | 2 +-
protocol/triple/openapi/encoder.go | 2 +-
remoting/getty/getty_client.go | 2 +-
remoting/getty/getty_server.go | 2 +-
16 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/cluster/router/affinity/router.go
b/cluster/router/affinity/router.go
index ae8d42338..e8e514821 100644
--- a/cluster/router/affinity/router.go
+++ b/cluster/router/affinity/router.go
@@ -26,7 +26,7 @@ import (
import (
"github.com/dubbogo/gost/log/logger"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/cluster/router/condition/dynamic_router.go
b/cluster/router/condition/dynamic_router.go
index e5a8252d7..e238bf530 100644
--- a/cluster/router/condition/dynamic_router.go
+++ b/cluster/router/condition/dynamic_router.go
@@ -27,7 +27,7 @@ import (
import (
"github.com/dubbogo/gost/log/logger"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/cluster/router/condition/route.go
b/cluster/router/condition/route.go
index 9ccf2aaf7..fbb835dd1 100644
--- a/cluster/router/condition/route.go
+++ b/cluster/router/condition/route.go
@@ -30,7 +30,7 @@ import (
"github.com/pkg/errors"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/cluster/router/script/router.go b/cluster/router/script/router.go
index 84073e15f..44ef8531d 100644
--- a/cluster/router/script/router.go
+++ b/cluster/router/script/router.go
@@ -25,7 +25,7 @@ import (
import (
"github.com/dubbogo/gost/log/logger"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/cluster/router/tag/router.go b/cluster/router/tag/router.go
index 635020fd9..93e7b79e2 100644
--- a/cluster/router/tag/router.go
+++ b/cluster/router/tag/router.go
@@ -26,7 +26,7 @@ import (
import (
"github.com/dubbogo/gost/log/logger"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/config_center/apollo/impl.go b/config_center/apollo/impl.go
index eeb14083d..9ee978454 100644
--- a/config_center/apollo/impl.go
+++ b/config_center/apollo/impl.go
@@ -34,7 +34,7 @@ import (
perrors "github.com/pkg/errors"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/config_center/apollo/listener.go b/config_center/apollo/listener.go
index 45019b9b7..c4054dc24 100644
--- a/config_center/apollo/listener.go
+++ b/config_center/apollo/listener.go
@@ -22,7 +22,7 @@ import (
"github.com/dubbogo/gost/log/logger"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/config_center/mock_dynamic_config.go
b/config_center/mock_dynamic_config.go
index af8cc23bb..ac0419645 100644
--- a/config_center/mock_dynamic_config.go
+++ b/config_center/mock_dynamic_config.go
@@ -25,7 +25,7 @@ import (
import (
gxset "github.com/dubbogo/gost/container/set"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/config_center/parser/configuration_parser.go
b/config_center/parser/configuration_parser.go
index ef8b55f52..851d6a41f 100644
--- a/config_center/parser/configuration_parser.go
+++ b/config_center/parser/configuration_parser.go
@@ -29,7 +29,7 @@ import (
perrors "github.com/pkg/errors"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/go.mod b/go.mod
index fc976ef18..090d8e213 100644
--- a/go.mod
+++ b/go.mod
@@ -61,13 +61,13 @@ require (
go.opentelemetry.io/otel/trace v1.21.0
go.uber.org/atomic v1.10.0
go.uber.org/zap v1.21.0
+ go.yaml.in/yaml/v4 v4.0.0-rc.6
golang.org/x/net v0.56.0
golang.org/x/sync v0.21.0
golang.org/x/tools v0.47.0
google.golang.org/grpc v1.64.1
google.golang.org/protobuf v1.34.2
gopkg.in/natefinch/lumberjack.v2 v2.2.1
- gopkg.in/yaml.v3 v3.0.1
)
require (
@@ -147,4 +147,5 @@ require (
google.golang.org/genproto/googleapis/rpc
v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 92f5b11f4..3388d114c 100644
--- a/go.sum
+++ b/go.sum
@@ -904,6 +904,8 @@ go.uber.org/zap v1.16.0/go.mod
h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4=
+go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod
h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
diff --git a/protocol/grpc/client.go b/protocol/grpc/client.go
index 4e327860a..a358a8724 100644
--- a/protocol/grpc/client.go
+++ b/protocol/grpc/client.go
@@ -34,11 +34,11 @@ import (
"github.com/opentracing/opentracing-go"
+ "go.yaml.in/yaml/v4"
+
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
-
- "gopkg.in/yaml.v3"
)
import (
diff --git a/protocol/rest/config/reader/rest_config_reader.go
b/protocol/rest/config/reader/rest_config_reader.go
index 88baf00ac..23818feeb 100644
--- a/protocol/rest/config/reader/rest_config_reader.go
+++ b/protocol/rest/config/reader/rest_config_reader.go
@@ -28,7 +28,7 @@ import (
perrors "github.com/pkg/errors"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/protocol/triple/openapi/encoder.go
b/protocol/triple/openapi/encoder.go
index a2a4cb055..322b001a6 100644
--- a/protocol/triple/openapi/encoder.go
+++ b/protocol/triple/openapi/encoder.go
@@ -23,7 +23,7 @@ import (
)
import (
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/remoting/getty/getty_client.go b/remoting/getty/getty_client.go
index 1383a56f4..77d8821a7 100644
--- a/remoting/getty/getty_client.go
+++ b/remoting/getty/getty_client.go
@@ -34,7 +34,7 @@ import (
"go.uber.org/atomic"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
diff --git a/remoting/getty/getty_server.go b/remoting/getty/getty_server.go
index 17c039dec..f5df00d48 100644
--- a/remoting/getty/getty_server.go
+++ b/remoting/getty/getty_server.go
@@ -31,7 +31,7 @@ import (
perrors "github.com/pkg/errors"
- "gopkg.in/yaml.v3"
+ "go.yaml.in/yaml/v4"
)
import (
