This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch 2.7.0.1-release-merge
in repository https://gitbox.apache.org/repos/asf/shenyu.git
commit 58fa0abf666c8ed2f360e71d8a430ee56902513b
Merge: 37ec999f9b 552e713d05
Author: liuhy <liuhon...@apache.org>
AuthorDate: Mon Apr 28 21:21:45 2025 +0800
Merge branch 'refs/heads/2.7.0.1-release'
# Conflicts:
# pom.xml
# shenyu-admin-listener/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-api/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-apollo/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-consul/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-etcd/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-nacos/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-polaris/pom.xml
# shenyu-admin-listener/shenyu-admin-listener-zookeeper/pom.xml
# shenyu-admin/pom.xml
# shenyu-alert/pom.xml
# shenyu-bootstrap/pom.xml
# shenyu-client/pom.xml
# shenyu-client/shenyu-client-api-docs-annotations/pom.xml
# shenyu-client/shenyu-client-autoconfig/pom.xml
# shenyu-client/shenyu-client-core/pom.xml
# shenyu-client/shenyu-client-dubbo/pom.xml
# shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/pom.xml
# shenyu-client/shenyu-client-dubbo/shenyu-client-dubbo-common/pom.xml
# shenyu-client/shenyu-client-grpc/pom.xml
# shenyu-client/shenyu-client-http/pom.xml
# shenyu-client/shenyu-client-http/shenyu-client-springmvc/pom.xml
# shenyu-client/shenyu-client-motan/pom.xml
# shenyu-client/shenyu-client-sofa/pom.xml
# shenyu-client/shenyu-client-tars/pom.xml
# shenyu-client/shenyu-client-websocket/pom.xml
#
shenyu-client/shenyu-client-websocket/shenyu-client-spring-websocket/pom.xml
# shenyu-common/pom.xml
# shenyu-disruptor/pom.xml
# shenyu-dist/pom.xml
# shenyu-dist/shenyu-admin-dist/pom.xml
# shenyu-dist/shenyu-bootstrap-dist/pom.xml
# shenyu-dist/shenyu-docker-compose-dist/pom.xml
# shenyu-dist/shenyu-src-dist/pom.xml
# shenyu-infra/pom.xml
# shenyu-infra/shenyu-infra-redis/pom.xml
# shenyu-kubernetes-controller/pom.xml
# shenyu-loadbalancer/pom.xml
# shenyu-plugin/pom.xml
# shenyu-plugin/shenyu-plugin-ai/pom.xml
# shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-common/pom.xml
# shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-prompt/pom.xml
# shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-proxy/pom.xml
#
shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-token-limiter/pom.xml
# shenyu-plugin/shenyu-plugin-api/pom.xml
# shenyu-plugin/shenyu-plugin-base/pom.xml
# shenyu-plugin/shenyu-plugin-cache/pom.xml
#
shenyu-plugin/shenyu-plugin-cache/shenyu-plugin-cache-handler/pom.xml
# shenyu-plugin/shenyu-plugin-cache/shenyu-plugin-cache-memory/pom.xml
# shenyu-plugin/shenyu-plugin-cache/shenyu-plugin-cache-redis/pom.xml
# shenyu-plugin/shenyu-plugin-cache/shenyu-plugin-cache-spi/pom.xml
# shenyu-plugin/shenyu-plugin-context-path/pom.xml
# shenyu-plugin/shenyu-plugin-fault-tolerance/pom.xml
#
shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-hystrix/pom.xml
#
shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-ratelimiter/pom.xml
#
shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-resilience4j/pom.xml
#
shenyu-plugin/shenyu-plugin-fault-tolerance/shenyu-plugin-sentinel/pom.xml
# shenyu-plugin/shenyu-plugin-global/pom.xml
# shenyu-plugin/shenyu-plugin-httpclient/pom.xml
# shenyu-plugin/shenyu-plugin-logging/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-console/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-huawei-lts/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/pom.xml
#
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/pom.xml
# shenyu-plugin/shenyu-plugin-metrics/pom.xml
# shenyu-plugin/shenyu-plugin-mock/pom.xml
# shenyu-plugin/shenyu-plugin-modify-response/pom.xml
# shenyu-plugin/shenyu-plugin-param-mapping/pom.xml
# shenyu-plugin/shenyu-plugin-proxy/pom.xml
# shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-divide/pom.xml
# shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-mqtt/pom.xml
# shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-general-context/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-grpc/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-tars/pom.xml
#
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-transform/pom.xml
# shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-tcp/pom.xml
# shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-websocket/pom.xml
# shenyu-plugin/shenyu-plugin-redirect/pom.xml
# shenyu-plugin/shenyu-plugin-request/pom.xml
# shenyu-plugin/shenyu-plugin-response/pom.xml
# shenyu-plugin/shenyu-plugin-rewrite/pom.xml
# shenyu-plugin/shenyu-plugin-security/pom.xml
#
shenyu-plugin/shenyu-plugin-security/shenyu-plugin-basic-auth/pom.xml
# shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/pom.xml
# shenyu-plugin/shenyu-plugin-security/shenyu-plugin-cryptor/pom.xml
# shenyu-plugin/shenyu-plugin-security/shenyu-plugin-jwt/pom.xml
# shenyu-plugin/shenyu-plugin-security/shenyu-plugin-key-auth/pom.xml
# shenyu-plugin/shenyu-plugin-security/shenyu-plugin-oauth2/pom.xml
# shenyu-plugin/shenyu-plugin-security/shenyu-plugin-sign/pom.xml
# shenyu-plugin/shenyu-plugin-uri/pom.xml
# shenyu-plugin/shenyu-plugin-waf/pom.xml
# shenyu-plugin/shenyu-plugin-wasm-api/pom.xml
# shenyu-plugin/shenyu-plugin-wasm-base/pom.xml
# shenyu-protocol/pom.xml
# shenyu-protocol/shenyu-protocol-grpc/pom.xml
# shenyu-protocol/shenyu-protocol-mqtt/pom.xml
# shenyu-protocol/shenyu-protocol-tcp/pom.xml
# shenyu-register-center/pom.xml
# shenyu-register-center/shenyu-register-client/pom.xml
#
shenyu-register-center/shenyu-register-client/shenyu-register-client-api/pom.xml
#
shenyu-register-center/shenyu-register-client/shenyu-register-client-http/pom.xml
# shenyu-register-center/shenyu-register-common/pom.xml
# shenyu-registry/pom.xml
# shenyu-registry/shenyu-registry-api/pom.xml
# shenyu-registry/shenyu-registry-apollo/pom.xml
# shenyu-registry/shenyu-registry-consul/pom.xml
# shenyu-registry/shenyu-registry-core/pom.xml
# shenyu-registry/shenyu-registry-etcd/pom.xml
# shenyu-registry/shenyu-registry-eureka/pom.xml
# shenyu-registry/shenyu-registry-kubernetes/pom.xml
# shenyu-registry/shenyu-registry-nacos/pom.xml
# shenyu-registry/shenyu-registry-polaris/pom.xml
# shenyu-registry/shenyu-registry-zookeeper/pom.xml
# shenyu-sdk/pom.xml
# shenyu-sdk/shenyu-sdk-core/pom.xml
# shenyu-sdk/shenyu-sdk-feign/pom.xml
# shenyu-sdk/shenyu-sdk-httpclient/pom.xml
# shenyu-sdk/shenyu-sdk-okhttp/pom.xml
# shenyu-sdk/shenyu-sdk-spring/pom.xml
# shenyu-spi/pom.xml
# shenyu-spring-boot-starter/pom.xml
# shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-apache-dubbo/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-common/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-tars/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/pom.xml
# shenyu-spring-boot-starter/shenyu-spring-boot-starter-k8s/pom.xml
# shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ai-prompt/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ai-proxy/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ai-token-limiter/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-basic-auth/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-cache/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-context-path/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-cryptor/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-divide/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-apache-dubbo/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-dubbo-common/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-general-context/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-global/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-grpc/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-hystrix/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-jwt/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-key-auth/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-aliyun-sls/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-clickhouse/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-console/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-elasticsearch/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-huawei-lts/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-kafka/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-pulsar/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-rabbitmq/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-rocketmq/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging-tencent-cls/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-metrics/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-mock/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-modify-response/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-mqtt/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-oauth2/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-param-mapping/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ratelimiter/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-redirect/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-request/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-resilience4j/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-response/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-rewrite/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sentinel/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sign/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-tars/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-tcp/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-transform/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-uri/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-waf/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-websocket/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sdk-feign/pom.xml
# shenyu-spring-boot-starter/shenyu-spring-boot-starter-sdk/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-apollo/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-consul/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-etcd/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-nacos/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-polaris/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-websocket/pom.xml
#
shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-zookeeper/pom.xml
# shenyu-sync-data-center/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-api/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-apollo/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-consul/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-etcd/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-http/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-nacos/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-polaris/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-websocket/pom.xml
# shenyu-sync-data-center/shenyu-sync-data-zookeeper/pom.xml
# shenyu-web/pom.xml
.../shenyu-spring-boot-starter-client-spring-websocket/pom.xml | 2 +-
shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
