This is an automated email from the ASF dual-hosted git repository.

jianbin pushed a change to branch 2.6.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git


    omit c62a35db84 test: Update comment in DmTableMetaCacheTest for clarity on 
unique index behavior
    omit 1fa24f1ac8 Merge branch '2.x' into 2.6.0
    omit 9b2158b58b test: Enhance NacosRegistryServiceImplTest with additional 
mocks for service name group and cluster (#8003)
    omit 708b0ca21e Merge remote-tracking branch 'refs/remotes/origin/2.x' into 
2.6.0
    omit a1bb731c80 bugfix: report branch status add branchType (#7992)
    omit 6e07d2f0fd feature: Support HTTP/2 stream push for the Watch API in 
Server Raft mode (#7903)
    omit 18a220d481 optimize : support multi-version codec & fix not returning 
client registration failure msg (#7000)
    omit 35945899a2 optimize: Remove unnecessary refreshLeader from 
ClusterController cluster endpoint (#7970)
    omit 9e6a84364c optimize:register PR #7967 in 2.x changelog (#7976)
    omit 182a950385 optimize:upgrade some dependencies (#7971)
    omit dc89be714d test: add unit tests for seata-discovery-nacos(provider and 
service) (#7962)
    omit 7daf5b0c9e bugfix: different element order in two lists causes failure 
to set the index as primary key index (#7965)
    omit 1198b2da06 bugfix: empty jacoco report on local when jdk above 17 
(#7956)
    omit 81504c09b7 optimize: change the getProperty call to 
resolvePlaceholders in SpringBootConfigurationProvider (#7955)
    omit 0011d5d965 refactor: replace Apache HttpClient with OkHttp in 
NamingServer (#7957)
    omit 1c95bdef0b bugfix: consoleApiService that could not be found (#7960)
    omit f717d74a71 optimize: modify the version to 2.7.0-SNAPSHOT (#7961)
    omit cb3a193918 feature: benchmark cli (#7865)
    omit e2bd89da56 optimize: upgrade qs dependency version to 6.14.1 (#7951)
    omit b9a94c0b1b feature: add metrics support for NamingServer (#7882)
    omit 481d1aa7ce optimize: update jib-maven-plugin version and increase 
parallel test execution limits (#7943)
    omit a75a21eaed optimize: add OkHttp and MockWebServer dependencies to 
resolve version confilcts (#7934)
    omit 1d4e81113b optimize: pin the Spring version for namingserver and 
console (#7930)
    omit e60c8c3226 doc: update changes (#7941)
    omit 6639332cf3 bugfix: ensure the Jakarta-related package paths are 
correct (#7940)
    omit f0c138cbb0 feature: unify Jackson/fastjson serialization.  (#7760)
    omit 0b1d07d4c4 bugfix: fix KingbaseUndoLogManager INSERT_UNDO_LOG_SQL 
error (#7929)
    omit 5e5979b153 doc: update 2.x.md for 2.6.0 release notes (#7921)

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/2.6.0 (04a42c083e)
            \
             O -- O -- O   (c62a35db84)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/workflows/test.yml                         |   2 +-
 .mvn/wrapper/maven-wrapper.properties              |   2 +-
 build/pom.xml                                      |   2 +-
 changes/en-us/2.x.md                               |  34 +-
 changes/zh-cn/2.x.md                               |  39 +-
 .../java/org/apache/seata/common/Constants.java    |   7 -
 .../executor/{Callback.java => HttpCallback.java}  |  24 +-
 .../seata/common/metadata/ClusterWatchEvent.java   |  75 --
 .../apache/seata/common/util/HttpClientUtil.java   | 228 ++----
 .../apache/seata/common/util/SeataHttpWatch.java   | 222 -----
 .../seata/common/util/HttpClientUtilTest.java      | 908 ++++++++++++---------
 .../seata/common/util/SeataHttpWatchTest.java      | 781 ------------------
 compatible/pom.xml                                 |   5 -
 .../io/seata/saga/engine/StateMachineTests.java    |   4 +-
 .../seata/config/AbstractConfigurationTest.java    |   1 -
 .../resources/static/console-fe/package-lock.json  | 146 ++--
 .../main/resources/static/console-fe/package.json  |   8 +-
 .../seata/core/protocol/ProtocolConstants.java     |   9 +-
 .../seata/core/protocol/RegisterRMResponse.java    |   1 -
 .../seata/core/protocol/RegisterTMResponse.java    |   1 -
 .../org/apache/seata/core/protocol/Version.java    |   3 -
 .../seata/core/rpc/netty/MultiProtocolDecoder.java |  71 +-
 .../seata/core/rpc/netty/NettyClientBootstrap.java |  14 +-
 .../seata/core/rpc/netty/ProtocolDecoder.java      |   2 -
 .../seata/core/rpc/netty/ProtocolEncoder.java      |   2 -
 .../seata/core/rpc/netty/v0/ProtocolDecoderV0.java |   7 +-
 .../seata/core/rpc/netty/v0/ProtocolEncoderV0.java |   8 +-
 .../seata/core/rpc/netty/v1/ProtocolDecoderV1.java |   7 +-
 .../seata/core/rpc/netty/v1/ProtocolEncoderV1.java |   9 +-
 .../seata/core/rpc/netty/v2/ProtocolDecoderV2.java |  31 -
 .../seata/core/rpc/netty/v2/ProtocolEncoderV2.java |  30 -
 .../core/rpc/processor/server/RegRmProcessor.java  |   1 -
 .../core/rpc/processor/server/RegTmProcessor.java  |   1 -
 .../seata/core/protocol/ProtocolConstantsTest.java |   2 +-
 dependencies/pom.xml                               |   4 +-
 .../registry/nacos/NacosRegistryServiceImpl.java   |  30 +-
 .../registry/nacos/NacosRegistryProviderTest.java  |  32 -
 .../nacos/NacosRegistryServiceImplTest.java        | 370 +--------
 integration-tx-api/pom.xml                         |   5 -
 .../tx/api/interceptor/ActionContextUtil.java      |   2 +-
 .../api/interceptor/ActionInterceptorHandler.java  |   2 +-
 .../rm/tcc/api/BusinessActionContextUtil.java      |   2 +-
 json-common/pom.xml                                |  64 --
 .../apache/seata/common/json/JsonSerializer.java   |  91 ---
 .../seata/common/json/JsonSerializerFactory.java   |  45 -
 .../org/apache/seata/common/json/JsonUtil.java     |  69 --
 .../common/json/impl/FastjsonJsonSerializer.java   | 144 ----
 .../seata/common/json/impl/GsonJsonSerializer.java | 116 ---
 .../common/json/impl/JacksonJsonSerializer.java    | 159 ----
 .../org.apache.seata.common.json.JsonSerializer    |  19 -
 .../common/json/FastjsonJsonSerializerTest.java    | 278 -------
 .../seata/common/json/GsonJsonSerializerTest.java  | 238 ------
 .../common/json/JacksonJsonSerializerTest.java     | 342 --------
 .../org/apache/seata/common/json/JsonUtilTest.java | 158 ----
 json-common/src/test/resources/file.conf           |  25 -
 json-common/src/test/resources/registry.conf       |  34 -
 .../processor/MockRegisterProcessor.java           |  46 +-
 namingserver/pom.xml                               |  24 +-
 .../seata/namingserver/config/WebConfig.java       |  34 +-
 .../namingserver/contants/NamingConstant.java      |   2 -
 .../namingserver/listener/ClusterChangeEvent.java  |  28 +-
 .../listener/ClusterChangePushEvent.java           |  49 --
 .../manager/ClusterWatcherManager.java             |  28 +-
 .../seata/namingserver/manager/NamingManager.java  |  34 +-
 .../metrics/NamingServerMetricsManager.java        |  63 --
 .../metrics/NamingServerTagsContributor.java       |  64 --
 .../metrics/NoOpNamingMetricsManager.java          |  53 --
 .../metrics/PrometheusNamingMetricsManager.java    | 181 ----
 namingserver/src/main/resources/application.yml    |  16 +-
 .../namingserver/ClusterWatcherManagerTest.java    |  26 +-
 .../seata/namingserver/NamingControllerV2Test.java |  32 +-
 .../seata/namingserver/NamingManagerTest.java      |  10 +-
 .../NamingServerMetricsManagerTest.java            | 233 ------
 namingserver/src/test/resources/application.yml    |  14 -
 pom.xml                                            |   4 +-
 rm-datasource/pom.xml                              |   5 -
 .../seata/rm/datasource/ConnectionContext.java     |  12 +-
 .../undo/kingbase/KingbaseUndoLogManager.java      |   2 +-
 .../org.apache.seata.common.json.JsonSerializer    |  19 -
 .../sql/struct/cache/DmTableMetaCacheTest.java     |   3 +-
 .../undo/kingbase/KingbaseUndoLogManagerTest.java  |   6 +-
 .../org.apache.seata.common.json.JsonSerializer    |  19 -
 .../apache/seata/rm/AbstractResourceManager.java   |   1 -
 saga/pom.xml                                       |   6 -
 .../engine/serializer/impl/ParamsSerializer.java   |  20 +-
 .../invoker/impl/SpringBeanServiceInvoker.java     |  16 +-
 .../parser/impl/StateMachineParserImpl.java        |  14 +-
 .../parser/utils/DesignerJsonTransformer.java      |   9 +-
 .../org.apache.seata.common.json.JsonSerializer    |  19 -
 .../saga/statelang/parser/StateParserTests.java    |  27 +-
 .../parser/utils/DesignerJsonTransformerTest.java  |   4 +-
 .../package-lock.json                              | 234 +-----
 saga/seata-saga-statemachine-designer/package.json |   4 +-
 .../provider/SpringBootConfigurationProvider.java  |   4 -
 .../serializer/seata/MessageCodecFactory.java      |  24 +-
 .../seata/serializer/seata/MultiVersionCodec.java  |  53 --
 .../seata/serializer/seata/SeataSerializer.java    |   5 +-
 .../v2/AbstractIdentifyResponseCodecV2.java        |  69 --
 .../protocol/v2/RegisterRMResponseCodecV2.java     |  30 -
 .../protocol/v2/RegisterTMResponseCodecV2.java     |  30 -
 .../seata/serializer/SeataSerializerV1.java        |  89 --
 .../seata/serializer/SeataSerializerV2.java        |  43 -
 .../serializer/seata/MultiVersionCodecTest.java    |  41 -
 .../protocol/v2/RegisterResponseCodecV2Test.java   |  89 --
 .../seata/serializer/SeataSerializerV1Test.java    |  82 --
 .../cluster/manager/ClusterWatcherManager.java     | 273 +------
 .../seata/server/controller/ClusterController.java |  51 +-
 .../cluster/manager/ClusterWatcherManagerTest.java | 266 +++---
 .../server/controller/ClusterControllerTest.java   | 412 ++++------
 .../seata/server/coordinator/AbstractCoreTest.java |   3 +-
 .../server/coordinator/RaftCoordinatorTest.java    |   3 +-
 test-suite/seata-benchmark-cli/README.md           | 470 -----------
 test-suite/seata-benchmark-cli/pom.xml             | 249 ------
 .../seata/benchmark/BenchmarkApplication.java      | 164 ----
 .../apache/seata/benchmark/BenchmarkRunner.java    | 140 ----
 .../seata/benchmark/config/BenchmarkConfig.java    | 177 ----
 .../benchmark/config/BenchmarkConfigLoader.java    | 135 ---
 .../benchmark/constant/BenchmarkConstants.java     |  65 --
 .../seata/benchmark/executor/ATModeExecutor.java   | 268 ------
 .../executor/AbstractTransactionExecutor.java      | 146 ----
 .../seata/benchmark/executor/SagaModeExecutor.java | 330 --------
 .../seata/benchmark/executor/TCCModeExecutor.java  |  66 --
 .../benchmark/executor/TransactionExecutor.java    |  42 -
 .../benchmark/executor/WorkloadGenerator.java      | 220 -----
 .../seata/benchmark/model/BenchmarkMetrics.java    | 188 -----
 .../seata/benchmark/model/TransactionRecord.java   |  82 --
 .../seata/benchmark/monitor/MetricsCollector.java  |  91 ---
 .../benchmark/saga/BenchmarkServiceInvoker.java    | 114 ---
 .../seata/benchmark/saga/InventorySagaService.java | 107 ---
 .../seata/benchmark/saga/OrderSagaService.java     | 111 ---
 .../seata/benchmark/saga/PaymentSagaService.java   | 112 ---
 .../saga/SimpleSpelExpressionFactory.java          |  74 --
 .../src/main/resources/file.conf                   |  69 --
 .../src/main/resources/logback.xml                 |  35 -
 .../src/main/resources/registry.conf               |  31 -
 .../seata/saga/statelang/benchmark_order_saga.json | 124 ---
 .../saga/statelang/benchmark_simple_saga.json      |  56 --
 .../core/rpc/netty/CodecTestCheckAuthHandler.java  |  38 -
 .../core/rpc/netty/MultiProtocolDecoderTest.java   | 148 ----
 .../seata/core/rpc/netty/TestClientHandler.java    |  73 --
 .../seata/core/rpc/netty/TestServerHandler.java    | 138 ----
 .../MultiVersionCompatibilityTest.java             | 405 ---------
 .../netty/multiversion/ServerV1ToClientV1Test.java |  70 --
 .../netty/multiversion/ServerV1ToClientV2Test.java |  71 --
 .../netty/multiversion/ServerV2ToClientV1Test.java |  68 --
 .../netty/multiversion/ServerV2ToClientV2Test.java |  72 --
 .../seata/saga/engine/StateMachineTests.java       |   4 +-
 .../mockserver/StateMachineDBMockServerTests.java  |  16 +-
 ....apache.seata.core.rpc.RegisterCheckAuthHandler |  17 -
 149 files changed, 1307 insertions(+), 11323 deletions(-)
 copy common/src/main/java/org/apache/seata/common/executor/{Callback.java => 
HttpCallback.java} (66%)
 delete mode 100644 
common/src/main/java/org/apache/seata/common/metadata/ClusterWatchEvent.java
 delete mode 100644 
common/src/main/java/org/apache/seata/common/util/SeataHttpWatch.java
 delete mode 100644 
common/src/test/java/org/apache/seata/common/util/SeataHttpWatchTest.java
 delete mode 100644 
core/src/main/java/org/apache/seata/core/rpc/netty/v2/ProtocolDecoderV2.java
 delete mode 100644 
core/src/main/java/org/apache/seata/core/rpc/netty/v2/ProtocolEncoderV2.java
 delete mode 100644 
discovery/seata-discovery-nacos/src/test/java/org/apache/seata/discovery/registry/nacos/NacosRegistryProviderTest.java
 delete mode 100644 json-common/pom.xml
 delete mode 100644 
json-common/src/main/java/org/apache/seata/common/json/JsonSerializer.java
 delete mode 100644 
json-common/src/main/java/org/apache/seata/common/json/JsonSerializerFactory.java
 delete mode 100644 
json-common/src/main/java/org/apache/seata/common/json/JsonUtil.java
 delete mode 100644 
json-common/src/main/java/org/apache/seata/common/json/impl/FastjsonJsonSerializer.java
 delete mode 100644 
json-common/src/main/java/org/apache/seata/common/json/impl/GsonJsonSerializer.java
 delete mode 100644 
json-common/src/main/java/org/apache/seata/common/json/impl/JacksonJsonSerializer.java
 delete mode 100644 
json-common/src/main/resources/META-INF/services/org.apache.seata.common.json.JsonSerializer
 delete mode 100644 
json-common/src/test/java/org/apache/seata/common/json/FastjsonJsonSerializerTest.java
 delete mode 100644 
json-common/src/test/java/org/apache/seata/common/json/GsonJsonSerializerTest.java
 delete mode 100644 
json-common/src/test/java/org/apache/seata/common/json/JacksonJsonSerializerTest.java
 delete mode 100644 
json-common/src/test/java/org/apache/seata/common/json/JsonUtilTest.java
 delete mode 100644 json-common/src/test/resources/file.conf
 delete mode 100644 json-common/src/test/resources/registry.conf
 delete mode 100644 
namingserver/src/main/java/org/apache/seata/namingserver/listener/ClusterChangePushEvent.java
 delete mode 100644 
namingserver/src/main/java/org/apache/seata/namingserver/metrics/NamingServerMetricsManager.java
 delete mode 100644 
namingserver/src/main/java/org/apache/seata/namingserver/metrics/NamingServerTagsContributor.java
 delete mode 100644 
namingserver/src/main/java/org/apache/seata/namingserver/metrics/NoOpNamingMetricsManager.java
 delete mode 100644 
namingserver/src/main/java/org/apache/seata/namingserver/metrics/PrometheusNamingMetricsManager.java
 delete mode 100644 
namingserver/src/test/java/org/apache/seata/namingserver/NamingServerMetricsManagerTest.java
 delete mode 100644 
rm-datasource/src/main/resources/META-INF/services/org.apache.seata.common.json.JsonSerializer
 delete mode 100644 
rm-datasource/src/test/resources/META-INF/services/org.apache.seata.common.json.JsonSerializer
 delete mode 100644 
saga/seata-saga-statelang/src/main/resources/META-INF/services/org.apache.seata.common.json.JsonSerializer
 delete mode 100644 
serializer/seata-serializer-seata/src/main/java/org/apache/seata/serializer/seata/MultiVersionCodec.java
 delete mode 100644 
serializer/seata-serializer-seata/src/main/java/org/apache/seata/serializer/seata/protocol/v2/AbstractIdentifyResponseCodecV2.java
 delete mode 100644 
serializer/seata-serializer-seata/src/main/java/org/apache/seata/serializer/seata/protocol/v2/RegisterRMResponseCodecV2.java
 delete mode 100644 
serializer/seata-serializer-seata/src/main/java/org/apache/seata/serializer/seata/protocol/v2/RegisterTMResponseCodecV2.java
 delete mode 100644 
serializer/seata-serializer-seata/src/main/java/org/apache/seata/serializer/seata/serializer/SeataSerializerV1.java
 delete mode 100644 
serializer/seata-serializer-seata/src/main/java/org/apache/seata/serializer/seata/serializer/SeataSerializerV2.java
 delete mode 100644 
serializer/seata-serializer-seata/src/test/java/org/apache/seata/serializer/seata/MultiVersionCodecTest.java
 delete mode 100644 
serializer/seata-serializer-seata/src/test/java/org/apache/seata/serializer/seata/protocol/v2/RegisterResponseCodecV2Test.java
 delete mode 100644 
serializer/seata-serializer-seata/src/test/java/org/apache/seata/serializer/seata/serializer/SeataSerializerV1Test.java
 delete mode 100644 test-suite/seata-benchmark-cli/README.md
 delete mode 100644 test-suite/seata-benchmark-cli/pom.xml
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/BenchmarkApplication.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/BenchmarkRunner.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/config/BenchmarkConfig.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/config/BenchmarkConfigLoader.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/constant/BenchmarkConstants.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/executor/ATModeExecutor.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/executor/AbstractTransactionExecutor.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/executor/SagaModeExecutor.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/executor/TCCModeExecutor.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/executor/TransactionExecutor.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/executor/WorkloadGenerator.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/model/BenchmarkMetrics.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/model/TransactionRecord.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/monitor/MetricsCollector.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/saga/BenchmarkServiceInvoker.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/saga/InventorySagaService.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/saga/OrderSagaService.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/saga/PaymentSagaService.java
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/java/org/apache/seata/benchmark/saga/SimpleSpelExpressionFactory.java
 delete mode 100644 test-suite/seata-benchmark-cli/src/main/resources/file.conf
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/resources/logback.xml
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/resources/registry.conf
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/resources/seata/saga/statelang/benchmark_order_saga.json
 delete mode 100644 
test-suite/seata-benchmark-cli/src/main/resources/seata/saga/statelang/benchmark_simple_saga.json
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/CodecTestCheckAuthHandler.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/MultiProtocolDecoderTest.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/TestClientHandler.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/TestServerHandler.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/multiversion/MultiVersionCompatibilityTest.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/multiversion/ServerV1ToClientV1Test.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/multiversion/ServerV1ToClientV2Test.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/multiversion/ServerV2ToClientV1Test.java
 delete mode 100644 
test-suite/test-new-version/src/test/java/org/apache/seata/core/rpc/netty/multiversion/ServerV2ToClientV2Test.java
 delete mode 100644 
test-suite/test-new-version/src/test/resources/META-INF/services/org.apache.seata.core.rpc.RegisterCheckAuthHandler


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to