From f8ed960050fa6d0cdd998836e52ff3ce77eec728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 6 Mar 2024 15:28:48 +0800 Subject: [PATCH 01/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20`dependencies-client?= =?UTF-8?q?`=20=E5=92=8C=20`dependencies-server`=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 16 +- common/pom.xml | 3 +- compatible/pom.xml | 5 - .../io/seata/metrics/exporter/Exporter.java | 25 -- .../io/seata/metrics/registry/Registry.java | 25 -- compressor/pom.xml | 3 +- config/pom.xml | 3 +- console/pom.xml | 3 +- core/pom.xml | 3 +- dependencies-client/pom.xml | 42 +++ dependencies-server/pom.xml | 42 +++ dependencies/pom.xml | 306 +++++++++++++++- discovery/pom.xml | 3 +- distribution/pom.xml | 3 +- ext/apm-seata-skywalking-plugin/pom.xml | 4 +- integration-tx-api/pom.xml | 3 +- integration/brpc/pom.xml | 3 +- integration/dubbo-alibaba/pom.xml | 3 +- integration/dubbo/pom.xml | 3 +- integration/grpc/pom.xml | 3 +- integration/hsf/pom.xml | 3 +- integration/http-jakarta/pom.xml | 3 +- integration/http/pom.xml | 3 +- integration/motan/pom.xml | 3 +- .../pom.xml | 44 +-- integration/rpc-core/pom.xml | 3 +- integration/sofa-rpc/pom.xml | 3 +- metrics/pom.xml | 3 +- pom.xml | 333 +----------------- rm-datasource/pom.xml | 3 +- rm/pom.xml | 3 +- rocketmq/pom.xml | 4 +- saga/pom.xml | 3 +- seata-plugin/pom.xml | 3 +- .../seata-spring-autoconfigure-client/pom.xml | 22 +- .../seata-spring-autoconfigure-core/pom.xml | 26 +- .../seata-spring-autoconfigure-server/pom.xml | 9 +- seata-spring-boot-starter/pom.xml | 18 +- serializer/pom.xml | 3 +- server/pom.xml | 3 +- spring/pom.xml | 3 +- sqlparser/pom.xml | 3 +- tcc/pom.xml | 3 +- test-mock-server/pom.xml | 3 +- test/pom.xml | 7 +- tm/pom.xml | 3 +- 46 files changed, 527 insertions(+), 491 deletions(-) delete mode 100644 compatible/src/main/java/io/seata/metrics/exporter/Exporter.java delete mode 100644 compatible/src/main/java/io/seata/metrics/registry/Registry.java create mode 100644 dependencies-client/pom.xml create mode 100644 dependencies-server/pom.xml rename {seata-spring-autoconfigure => integration}/pom.xml (52%) diff --git a/all/pom.xml b/all/pom.xml index 97cd30bbba6..7eccd39de36 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-build + seata-dependencies-client ${revision} - ../build/pom.xml + ../dependencies-client/pom.xml 4.0.0 @@ -32,18 +32,6 @@ Seata All-in-one ${project.version} Seata is an easy-to-use, high-performance, java based, open source distributed transaction solution. - - - - org.apache.seata - seata-dependencies - ${project.version} - pom - import - - - - diff --git a/common/pom.xml b/common/pom.xml index 517aae769ae..ac310c43cb3 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 seata-common diff --git a/compatible/pom.xml b/compatible/pom.xml index 5d4de46dbbb..ca1ace5346a 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -52,11 +52,6 @@ seata-integration-tx-api ${project.version} - - org.apache.seata - seata-metrics-api - ${project.version} - org.apache.seata seata-sqlparser-druid diff --git a/compatible/src/main/java/io/seata/metrics/exporter/Exporter.java b/compatible/src/main/java/io/seata/metrics/exporter/Exporter.java deleted file mode 100644 index 612b8484423..00000000000 --- a/compatible/src/main/java/io/seata/metrics/exporter/Exporter.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.seata.metrics.exporter; - - -/** - * Exporter interface for metrics - * - */ -public interface Exporter extends org.apache.seata.metrics.exporter.Exporter { -} diff --git a/compatible/src/main/java/io/seata/metrics/registry/Registry.java b/compatible/src/main/java/io/seata/metrics/registry/Registry.java deleted file mode 100644 index 7bb8b78f796..00000000000 --- a/compatible/src/main/java/io/seata/metrics/registry/Registry.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.seata.metrics.registry; - - -/** - * Registry interface for metrics - * - */ -public interface Registry extends org.apache.seata.metrics.registry.Registry { -} diff --git a/compressor/pom.xml b/compressor/pom.xml index 65e64804b17..a94e0ebc1a5 100644 --- a/compressor/pom.xml +++ b/compressor/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 seata-compressor diff --git a/config/pom.xml b/config/pom.xml index 3ed784fb152..467a07827e8 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 seata-config diff --git a/console/pom.xml b/console/pom.xml index 3723376a432..4a1b2f4ce89 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-server ${revision} + ../dependencies-server/pom.xml 4.0.0 seata-console diff --git a/core/pom.xml b/core/pom.xml index 9de6107bc03..15c6987767d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 seata-core diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml new file mode 100644 index 00000000000..180a7b92dc8 --- /dev/null +++ b/dependencies-client/pom.xml @@ -0,0 +1,42 @@ + + + + + org.apache.seata + seata-dependencies + ${revision} + ../dependencies/pom.xml + + 4.0.0 + + seata-dependencies-client + pom + + Seata dependencies-client ${project.version} + dependencies for Seata client built with Maven + + + + + + + diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml new file mode 100644 index 00000000000..4637a4bf18c --- /dev/null +++ b/dependencies-server/pom.xml @@ -0,0 +1,42 @@ + + + + + org.apache.seata + seata-dependencies + ${revision} + ../dependencies/pom.xml + + 4.0.0 + + seata-dependencies-server + pom + + Seata dependencies-server ${project.version} + dependencies for Seata server and console built with Maven + + + + + + + diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 0f67224ce32..c9059ccf51f 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -33,7 +33,7 @@ pom Seata dependencies ${project.version} - dependencies for Seata built with Maven + dependencies for Seata client and server built with Maven 1.0.2 @@ -809,4 +809,308 @@ + + + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.platform + junit-platform-launcher + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.mockito + mockito-inline + test + + + org.assertj + assertj-core + test + + + org.slf4j + slf4j-simple + test + + + + + + + licenseCheck + + + + org.codehaus.mojo + license-maven-plugin + + + license-check + generate-sources + + add-third-party + + + false + false + false + + Apache License, Version 2.0|The Apache Software License, Version + 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0 + + The MIT License|MIT License + The 3-Clause BSD License|New BSD License|3-Clause BSD + License|BSD|3-Clause BSD License|The New BSD License + + + + + + + + + + + + image + + false + false + 5.1.42 + 8.0.27 + + + + + release-image-based-on-java8 + + ${project.version},latest + + + + + release-image-based-on-java8-slim + + ${project.version}-slim + + + + + release-image-based-on-java17 + + ${project.version}.jre17 + + + + + release-image-based-on-java17-slim + + ${project.version}.jre17-slim + + + + + arrch64 + + osx-x86_64 + + + + + checkstyle + + [1.8,) + + + + + com.mycila + license-maven-plugin + + + generate-sources + + remove + format + + + + + true +
${user.dir}/style/copyright
+ + **/src/main/java/** + **/src/test/java/** + **/*.xml + **/*.sql + **/*.conf + **/*.yml + **/*.yaml + **/*.sh + **/*.bat + **/*.lua + **/*.properties + **/*.txt + **/*.def + + + **/generated/** + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + true + + SLASHSTAR_STYLE + DOUBLEBAR_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + validate + validate + + ${user.dir}/style/seata_checkstyle.xml + ${user.dir}/style/seata_suppressions.xml + UTF-8 + true + true + + + checkstyle + + + + + + + + + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + **/*.java.template + + + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + ${project.build.sourceEncoding} + 2 + true + + rulesets/java/ali-comment.xml + rulesets/java/ali-concurrent.xml + rulesets/java/ali-constant.xml + rulesets/java/ali-exception.xml + rulesets/java/ali-flowcontrol.xml + rulesets/java/ali-naming.xml + rulesets/java/ali-oop.xml + rulesets/java/ali-orm.xml + rulesets/java/ali-other.xml + rulesets/java/ali-set.xml + + + **/generated/*.java + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + + + + pmd-check + validate + + check + + + + + + com.alibaba.p3c + p3c-pmd + ${p3c-pmd.version} + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + test + + report + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + ${maven.surefire.argLine} + ${maven.surefire.excludes} + + + + diff --git a/discovery/pom.xml b/discovery/pom.xml index 52f43d2a23f..674402655d5 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 pom diff --git a/distribution/pom.xml b/distribution/pom.xml index d19adc51b5a..5c690c2a0fc 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-server ${revision} + ../dependencies-server/pom.xml 4.0.0 seata-distribution diff --git a/ext/apm-seata-skywalking-plugin/pom.xml b/ext/apm-seata-skywalking-plugin/pom.xml index 014b36b571f..a1775ec7f9e 100644 --- a/ext/apm-seata-skywalking-plugin/pom.xml +++ b/ext/apm-seata-skywalking-plugin/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-server ${revision} - ../../pom.xml + ../../dependencies-server/pom.xml 4.0.0 apm-seata-skywalking-plugin diff --git a/integration-tx-api/pom.xml b/integration-tx-api/pom.xml index 624edb9fd5c..2e3f4d117fa 100644 --- a/integration-tx-api/pom.xml +++ b/integration-tx-api/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-integration-tx-api diff --git a/integration/brpc/pom.xml b/integration/brpc/pom.xml index 21cacfe9366..dea6b819b19 100644 --- a/integration/brpc/pom.xml +++ b/integration/brpc/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-brpc diff --git a/integration/dubbo-alibaba/pom.xml b/integration/dubbo-alibaba/pom.xml index 2887e3f61a0..052b71f3368 100644 --- a/integration/dubbo-alibaba/pom.xml +++ b/integration/dubbo-alibaba/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 diff --git a/integration/dubbo/pom.xml b/integration/dubbo/pom.xml index b61e8307e92..49b250dc269 100644 --- a/integration/dubbo/pom.xml +++ b/integration/dubbo/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-dubbo diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml index 77769bd6370..125a6664d06 100644 --- a/integration/grpc/pom.xml +++ b/integration/grpc/pom.xml @@ -21,10 +21,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - seata-parent org.apache.seata + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-grpc diff --git a/integration/hsf/pom.xml b/integration/hsf/pom.xml index a8361456fdd..d7ca14fa60c 100644 --- a/integration/hsf/pom.xml +++ b/integration/hsf/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-hsf diff --git a/integration/http-jakarta/pom.xml b/integration/http-jakarta/pom.xml index 73e7042863d..c3379d5c9e8 100644 --- a/integration/http-jakarta/pom.xml +++ b/integration/http-jakarta/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-http-jakarta diff --git a/integration/http/pom.xml b/integration/http/pom.xml index f3bb6c28743..fe68db016a4 100644 --- a/integration/http/pom.xml +++ b/integration/http/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-http diff --git a/integration/motan/pom.xml b/integration/motan/pom.xml index 46b6b4008a3..fbaf51c0034 100644 --- a/integration/motan/pom.xml +++ b/integration/motan/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-motan diff --git a/seata-spring-autoconfigure/pom.xml b/integration/pom.xml similarity index 52% rename from seata-spring-autoconfigure/pom.xml rename to integration/pom.xml index f3fe0522790..462aad4e181 100644 --- a/seata-spring-autoconfigure/pom.xml +++ b/integration/pom.xml @@ -22,40 +22,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 - seata-spring-autoconfigure pom - seata-spring-autoconfigure ${project.version} - spring-autoconfigure top parent for Seata built with Maven + seata-integration + seata-integration ${project.version} + integration top parent for Seata built with Maven - seata-spring-autoconfigure-core - seata-spring-autoconfigure-client - seata-spring-autoconfigure-server + brpc + dubbo + dubbo-alibaba + grpc + hsf + http + http-jakarta + motan + rpc-core + sofa-rpc - - - - - ${project.groupId} - seata-all - ${project.version} - true - - - - - org.springframework.boot - spring-boot-autoconfigure - true - - - org.springframework.boot - spring-boot-configuration-processor - true - - diff --git a/integration/rpc-core/pom.xml b/integration/rpc-core/pom.xml index 9386b453e7c..90a930606d9 100644 --- a/integration/rpc-core/pom.xml +++ b/integration/rpc-core/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-rpc-core diff --git a/integration/sofa-rpc/pom.xml b/integration/sofa-rpc/pom.xml index 041f73d5a3c..5e62e75600a 100644 --- a/integration/sofa-rpc/pom.xml +++ b/integration/sofa-rpc/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-integration ${revision} - ../../pom.xml 4.0.0 seata-sofa-rpc diff --git a/metrics/pom.xml b/metrics/pom.xml index 3f30c790cd9..5387d7cb179 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-server ${revision} + ../dependencies-server/pom.xml 4.0.0 pom diff --git a/pom.xml b/pom.xml index a9feab80b9e..e218cd270cc 100644 --- a/pom.xml +++ b/pom.xml @@ -43,18 +43,11 @@ core compatible dependencies + dependencies-client + dependencies-server discovery distribution - integration/rpc-core - integration/dubbo - integration/dubbo-alibaba - integration/sofa-rpc - integration/motan - integration/grpc - integration/http - integration/http-jakarta - integration/hsf - integration/brpc + integration rm rm-datasource rocketmq @@ -66,7 +59,9 @@ metrics serializer seata-spring-boot-starter - seata-spring-autoconfigure + seata-spring-autoconfigure/seata-spring-autoconfigure-core + seata-spring-autoconfigure/seata-spring-autoconfigure-client + seata-spring-autoconfigure/seata-spring-autoconfigure-server compressor saga sqlparser @@ -75,320 +70,4 @@ integration-tx-api - - - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.platform - junit-platform-launcher - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - org.mockito - mockito-inline - test - - - org.assertj - assertj-core - test - - - org.slf4j - slf4j-simple - test - - - - - - - org.apache.seata - seata-dependencies - ${project.version} - pom - import - - - - - - - - licenseCheck - - - - org.codehaus.mojo - license-maven-plugin - - - license-check - generate-sources - - add-third-party - - - false - false - false - - Apache License, Version 2.0|The Apache Software License, Version - 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0 - - The MIT License|MIT License - The 3-Clause BSD License|New BSD License|3-Clause BSD - License|BSD|3-Clause BSD License|The New BSD License - - - - - - - - - - - - image - - false - false - 5.1.42 - 8.0.27 - - - - - release-image-based-on-java8 - - ${project.version},latest - - - - - release-image-based-on-java8-slim - - ${project.version}-slim - - - - - release-image-based-on-java17 - - ${project.version}.jre17 - - - - - release-image-based-on-java17-slim - - ${project.version}.jre17-slim - - - - - arrch64 - - osx-x86_64 - - - - - checkstyle - - [1.8,) - - - - - com.mycila - license-maven-plugin - - - generate-sources - - remove - format - - - - - true -
${user.dir}/style/copyright
- - **/src/main/java/** - **/src/test/java/** - **/*.xml - **/*.sql - **/*.conf - **/*.yml - **/*.yaml - **/*.sh - **/*.bat - **/*.lua - **/*.properties - **/*.txt - **/*.def - - - **/generated/** - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - true - - SLASHSTAR_STYLE - DOUBLEBAR_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - validate - validate - - ${user.dir}/style/seata_checkstyle.xml - ${user.dir}/style/seata_suppressions.xml - UTF-8 - true - true - - - checkstyle - - - - - - - - - - - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - **/*.java.template - - - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - ${project.build.sourceEncoding} - 2 - true - - rulesets/java/ali-comment.xml - rulesets/java/ali-concurrent.xml - rulesets/java/ali-constant.xml - rulesets/java/ali-exception.xml - rulesets/java/ali-flowcontrol.xml - rulesets/java/ali-naming.xml - rulesets/java/ali-oop.xml - rulesets/java/ali-orm.xml - rulesets/java/ali-other.xml - rulesets/java/ali-set.xml - - - **/generated/*.java - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - - - - pmd-check - validate - - check - - - - - - com.alibaba.p3c - p3c-pmd - ${p3c-pmd.version} - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${maven.surefire.argLine} - ${maven.surefire.excludes} - - - - diff --git a/rm-datasource/pom.xml b/rm-datasource/pom.xml index 93f3c5a9e92..7dc86142f25 100644 --- a/rm-datasource/pom.xml +++ b/rm-datasource/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-rm-datasource diff --git a/rm/pom.xml b/rm/pom.xml index e00efb5241a..62d320b63ad 100644 --- a/rm/pom.xml +++ b/rm/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-rm diff --git a/rocketmq/pom.xml b/rocketmq/pom.xml index 23297aff44a..fe53a913f13 100644 --- a/rocketmq/pom.xml +++ b/rocketmq/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} - ../pom.xml + ../dependencies-client/pom.xml 4.0.0 seata-rocketmq diff --git a/saga/pom.xml b/saga/pom.xml index 68185fed444..b6aa8a4b6b4 100644 --- a/saga/pom.xml +++ b/saga/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 pom diff --git a/seata-plugin/pom.xml b/seata-plugin/pom.xml index bf1734d1182..10aad933d8f 100644 --- a/seata-plugin/pom.xml +++ b/seata-plugin/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml index 1f5e7ca9ce2..e35cc30671a 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml @@ -21,9 +21,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - seata-spring-autoconfigure org.apache.seata + seata-dependencies-client ${revision} + ../../dependencies-client/pom.xml 4.0.0 @@ -37,5 +38,24 @@ seata-spring-autoconfigure-core ${project.version} + + + + ${project.groupId} + seata-all + ${project.version} + + + log4j + log4j + + + + + + org.springframework.boot + spring-boot-configuration-processor + true + \ No newline at end of file diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml index a3767ecb0ab..2b8c30a74d3 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml @@ -21,9 +21,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - seata-spring-autoconfigure org.apache.seata + seata-dependencies ${revision} + ../../dependencies/pom.xml 4.0.0 @@ -32,11 +33,34 @@ spring-autoconfigure-core for Seata built with Maven + + org.springframework.boot + spring-boot-autoconfigure + + + + ${project.groupId} + seata-core + ${project.version} + + + + org.springframework.boot + spring-boot-configuration-processor + true + + ${project.groupId} seata-discovery-all ${project.version} test + + ${project.groupId} + seata-config-all + ${project.version} + test + \ No newline at end of file diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml index 37442001120..2bd510e2844 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml @@ -21,9 +21,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - seata-spring-autoconfigure org.apache.seata + seata-dependencies-server ${revision} + ../../dependencies-server/pom.xml 4.0.0 @@ -37,6 +38,12 @@ seata-spring-autoconfigure-core ${project.version} + + + org.springframework.boot + spring-boot-configuration-processor + true + \ No newline at end of file diff --git a/seata-spring-boot-starter/pom.xml b/seata-spring-boot-starter/pom.xml index 24f449166b0..b9856046036 100644 --- a/seata-spring-boot-starter/pom.xml +++ b/seata-spring-boot-starter/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-spring-boot-starter @@ -37,18 +38,6 @@ seata-spring-autoconfigure-client ${project.version} - - - ${project.groupId} - seata-all - ${project.version} - - - log4j - log4j - - - org.springframework @@ -58,8 +47,7 @@ org.springframework.boot - spring-boot-autoconfigure - true + spring-boot-starter org.springframework.boot diff --git a/serializer/pom.xml b/serializer/pom.xml index 6b06a80f4e9..6a77926e99d 100644 --- a/serializer/pom.xml +++ b/serializer/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 seata-serializer diff --git a/server/pom.xml b/server/pom.xml index fd7f6de18d4..35328a0a781 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-server ${revision} + ../dependencies-server/pom.xml 4.0.0 seata-server diff --git a/spring/pom.xml b/spring/pom.xml index b57056320a3..7d0366f4704 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-spring diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml index 70cbe0b1085..ae07c7e21b5 100644 --- a/sqlparser/pom.xml +++ b/sqlparser/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-sqlparser diff --git a/tcc/pom.xml b/tcc/pom.xml index 887e7225c30..230d43b409b 100644 --- a/tcc/pom.xml +++ b/tcc/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-tcc diff --git a/test-mock-server/pom.xml b/test-mock-server/pom.xml index af6f9916da1..c53af1f7f50 100644 --- a/test-mock-server/pom.xml +++ b/test-mock-server/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-server ${revision} + ../dependencies-server/pom.xml 4.0.0 seata-mock-server diff --git a/test/pom.xml b/test/pom.xml index 91d4c9f60fb..77560620117 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-test @@ -50,7 +51,7 @@ ${project.version} - + ${project.groupId} seata-server @@ -58,7 +59,7 @@ org.apache.seata - seata-spring-autoconfigure-core + seata-spring-autoconfigure-server diff --git a/tm/pom.xml b/tm/pom.xml index 66351ea43dc..62ea836b64a 100644 --- a/tm/pom.xml +++ b/tm/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-client ${revision} + ../dependencies-client/pom.xml 4.0.0 seata-tm From 6a2269a6c667d924441c8897ef9debf7fcbe3901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 6 Mar 2024 15:40:06 +0800 Subject: [PATCH 02/52] =?UTF-8?q?=E9=83=A8=E5=88=86profile=E8=BD=AC?= =?UTF-8?q?=E7=A7=BB=E5=88=B0dependencies-server=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-server/pom.xml | 41 +++++++++++++++++++++++++++++++++++++ dependencies/pom.xml | 38 ---------------------------------- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 4637a4bf18c..45ac8180d4b 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -39,4 +39,45 @@ + + + + + image + + false + false + 5.1.42 + 8.0.27 + + + + + release-image-based-on-java8 + + ${project.version},latest + + + + + release-image-based-on-java8-slim + + ${project.version}-slim + + + + + release-image-based-on-java17 + + ${project.version}.jre17 + + + + + release-image-based-on-java17-slim + + ${project.version}.jre17-slim + + + diff --git a/dependencies/pom.xml b/dependencies/pom.xml index c9059ccf51f..d0d8a61af24 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -885,44 +885,6 @@ - - - image - - false - false - 5.1.42 - 8.0.27 - - - - - release-image-based-on-java8 - - ${project.version},latest - - - - - release-image-based-on-java8-slim - - ${project.version}-slim - - - - - release-image-based-on-java17 - - ${project.version}.jre17 - - - - - release-image-based-on-java17-slim - - ${project.version}.jre17-slim - - arrch64 From 36c30518cf90858b7bde08b6f35ddc5b634b1853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 6 Mar 2024 17:11:19 +0800 Subject: [PATCH 03/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=20dependencies=20?= =?UTF-8?q?=E7=9A=84=E5=AE=9A=E4=B9=89=EF=BC=8C=E8=BF=81=E7=A7=BB=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AE=9A=E4=B9=89=E5=88=B0=20client=20=E5=92=8C=20ser?= =?UTF-8?q?ver=20=E4=B8=AD=EF=BC=8C=E6=98=8E=E7=A1=AE=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E7=94=A8=E8=8C=83=E5=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 34 ++++----- build/pom.xml | 9 --- compatible/pom.xml | 2 +- console/pom.xml | 73 ------------------ dependencies-client/pom.xml | 10 +++ dependencies-server/pom.xml | 49 +++++++++++- dependencies/pom.xml | 144 +++++++++--------------------------- distribution/NOTICE.md | 64 ++++++++-------- server/pom.xml | 130 +++++++------------------------- test-mock-server/pom.xml | 53 ------------- test/pom.xml | 25 ++++--- 11 files changed, 182 insertions(+), 411 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index feda1f93072..a7a6dcaeedb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,14 +19,14 @@ jobs: windows, # Skip tests, because too many errors in unit-test. ] springboot: [ - 2.7.18 -D spring-framework.version=5.3.31, - 2.6.15 -D spring-framework.version=5.3.27, - 2.5.15 -D spring-framework.version=5.3.27, - 2.4.13 -D spring-framework.version=5.3.13, - 2.3.12.RELEASE -D spring-framework.version=5.2.15.RELEASE, - 2.2.13.RELEASE -D spring-framework.version=5.2.12.RELEASE, + 2.7.18, + 2.6.15, + 2.5.15, + 2.4.13, + 2.3.12.RELEASE, + 2.2.13.RELEASE, #2.1.18.RELEASE, - #2.0.9.RELEASE, + #2.0.9.RELEASE ] steps: # step 1 @@ -70,9 +70,9 @@ jobs: windows, # Skip tests, because too many errors in unit-test. ] springboot: [ - 3.2.0 -D spring-framework.version=6.1.1, - 3.1.6 -D spring-framework.version=6.0.14, - 3.0.13 -D spring-framework.version=6.0.14, + 3.2.0, + 3.1.6, + 3.0.13 ] steps: # step 1 @@ -110,14 +110,14 @@ jobs: fail-fast: false matrix: springboot: [ - #2.7.18 -Dspring-framework.version=5.3.31, # The maven-compiler-plugin will throw an error for an unknown reason. - #2.6.15 -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason. - #2.5.15 -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason. - 2.4.13 -Dspring-framework.version=5.3.13, - 2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE, - 2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE, + #2.7.18, # The maven-compiler-plugin will throw an error for an unknown reason. + #2.6.15, # The maven-compiler-plugin will throw an error for an unknown reason. + #2.5.15, # The maven-compiler-plugin will throw an error for an unknown reason. + 2.4.13, + 2.3.12.RELEASE, + 2.2.13.RELEASE, #2.1.18.RELEASE, - #2.0.9.RELEASE, + #2.0.9.RELEASE ] steps: # step 1 diff --git a/build/pom.xml b/build/pom.xml index 4503b6ff30d..cda4e3b41bb 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -75,15 +75,6 @@ UTF-8 UTF-8 - - 2.5.15 - 5.3.27 - - - 0.2.0-RC2 - 3.6.1 - 2.0 - 5.8.2 1.8.2 diff --git a/compatible/pom.xml b/compatible/pom.xml index ca1ace5346a..ec9e530748b 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -97,7 +97,7 @@ spring-expression - 5.3.26 + 5.3.27 provided diff --git a/console/pom.xml b/console/pom.xml index 4a1b2f4ce89..543d2b07316 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -32,60 +32,6 @@ seata-console ${project.version} console for Seata built with Maven - - 2.7.17 - 5.3.30 - 2.0 - 9.0.83 - - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - - - org.springframework - spring-framework-bom - ${spring-framework-for-server.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot-for-server.version} - - - org.springframework - spring-framework-bom - - - pom - import - - - org.yaml - snakeyaml - ${snakeyaml-for-server.version} - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat-embed.version} - - - - org.springframework.boot @@ -100,21 +46,6 @@ org.springframework.boot spring-boot-starter-web - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.yaml - snakeyaml - - - - - org.yaml - snakeyaml - ${snakeyaml.version} org.springframework.boot @@ -142,10 +73,6 @@ jjwt-jackson runtime - - org.apache.tomcat.embed - tomcat-embed-core - diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index 180a7b92dc8..7b632145ed4 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -35,8 +35,18 @@ dependencies for Seata client built with Maven + + 5.0.0 + + + + org.apache.rocketmq + rocketmq-client + ${rocketmq-version} + + diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 45ac8180d4b..b26ac896e9a 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -35,9 +35,56 @@ dependencies for Seata server and console built with Maven + 2.7.18 + + + 5.1.42 + 8.0.27 + + + 0.2.0-RC2 + 3.6.1 + + 1.82 + + + 3.1.7 + + + + + org.apache.kafka + kafka-clients + ${kafka-clients.version} + + + com.github.danielwegener + logback-kafka-appender + ${kafka-appender.version} + + + + net.logstash.logback + logstash-logback-encoder + ${logstash-logback-encoder.version} + + + + com.beust + jcommander + ${jcommander.version} + + + + + org.codehaus.janino + janino + ${janino-version} + + @@ -47,8 +94,6 @@ false false - 5.1.42 - 8.0.27 diff --git a/dependencies/pom.xml b/dependencies/pom.xml index d0d8a61af24..c5819f22ea5 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -33,9 +33,11 @@ pom Seata dependencies ${project.version} - dependencies for Seata client and server built with Maven + dependencies for Seata built with Maven + 2.5.15 + 1.0.2 2.5.9 1.8.3 @@ -68,7 +70,6 @@ 0.7.6 6.3.0 1.0.0 - 1.82 1.21 1.10.12 1.7.1 @@ -117,17 +118,11 @@ ${mysql.version} 8.0.27 - - 5.0.0 1.4.32 1.4.3 - - 5.3.26 - 9.0.83 - 4.11.0 3.12.2 @@ -138,43 +133,6 @@ - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - - - org.springframework - spring-framework-bom - ${spring-framework.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - - - org.springframework - spring-framework-bom - - - org.apache.tomcat.embed - tomcat-embed-core - - - pom - import - - io.netty @@ -546,12 +504,6 @@ - - - com.beust - jcommander - ${jcommander.version} - io.grpc @@ -706,51 +658,7 @@ logback-core ${logback.version} - - - net.logstash.logback - logstash-logback-encoder - ${logstash-logback-encoder.version} - - - com.github.danielwegener - logback-kafka-appender - ${kafka-appender.version} - - - org.apache.kafka - kafka-clients - - - - - org.apache.kafka - kafka-clients - ${kafka-clients.version} - - - - - org.mockito - mockito-core - ${mockito.version} - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - - - org.mockito - mockito-inline - ${mockito.version} - - - org.assertj - assertj-core - ${assertj-core.version} - com.thoughtworks.xstream xstream @@ -786,26 +694,46 @@ jetty-servlet ${jetty-version} + + + + + org.mockito + mockito-core + ${mockito.version} + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + - org.codehaus.janino - janino - ${janino-version} + org.mockito + mockito-inline + ${mockito.version} + - org.apache.rocketmq - rocketmq-client - ${rocketmq-version} + org.assertj + assertj-core + ${assertj-core.version} - - + - org.springframework - spring-webmvc - ${spring-webmvc.version} + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + - org.apache.tomcat.embed - tomcat-embed-core + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import diff --git a/distribution/NOTICE.md b/distribution/NOTICE.md index 2d1e571afad..502015b440f 100644 --- a/distribution/NOTICE.md +++ b/distribution/NOTICE.md @@ -188,17 +188,17 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to ├── snakeyaml-2.0.jar ├── snappy-java-1.1.8.4.jar ├── sofa-common-tools-1.0.12.jar - ├── spring-aop-5.3.30.jar - ├── spring-beans-5.3.30.jar - ├── spring-boot-autoconfigure-2.7.17.jar - ├── spring-boot-starter-logging-2.7.17.jar - ├── spring-boot-starter-security-2.7.17.jar - ├── spring-boot-starter-tomcat-2.7.17.jar - ├── spring-boot-starter-web-2.7.17.jar - ├── spring-context-5.3.30.jar - ├── spring-core-5.3.30.jar - ├── spring-expression-5.3.30.jar - ├── spring-jcl-5.3.30.jar + ├── spring-aop-5.3.31.jar + ├── spring-beans-5.3.31.jar + ├── spring-boot-autoconfigure-2.7.18.jar + ├── spring-boot-starter-logging-2.7.18.jar + ├── spring-boot-starter-security-2.7.18.jar + ├── spring-boot-starter-tomcat-2.7.18.jar + ├── spring-boot-starter-web-2.7.18.jar + ├── spring-context-5.3.31.jar + ├── spring-core-5.3.31.jar + ├── spring-expression-5.3.31.jar + ├── spring-jcl-5.3.31.jar ├── spring-security-config-5.7.11.jar ├── spring-security-web-5.7.11.jar ├── stringtemplate-3.2.1.jar @@ -265,13 +265,13 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to ├── seata-spring-autoconfigure-core-2.1.0-SNAPSHOT.jar ├── simpleclient_httpserver-0.15.0.jar ├── slf4j-api-1.7.36.jar - ├── spring-boot-2.7.17.jar - ├── spring-boot-starter-2.7.17.jar - ├── spring-boot-starter-json-2.7.17.jar + ├── spring-boot-2.7.18.jar + ├── spring-boot-starter-2.7.18.jar + ├── spring-boot-starter-json-2.7.18.jar ├── spring-security-core-5.7.11.jar ├── spring-security-crypto-5.7.11.jar - ├── spring-web-5.3.30.jar - ├── spring-webmvc-5.3.30.jar + ├── spring-web-5.3.31.jar + ├── spring-webmvc-5.3.31.jar ├── xstream-1.4.20.jar └── jdbc ├── mysql-connector-java-8.0.28.jar @@ -470,17 +470,17 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to ├── snakeyaml-2.0.jar ├── snappy-java-1.1.8.4.jar ├── sofa-common-tools-1.0.12.jar - ├── spring-aop-5.3.30.jar - ├── spring-beans-5.3.30.jar - ├── spring-boot-autoconfigure-2.7.17.jar - ├── spring-boot-starter-logging-2.7.17.jar - ├── spring-boot-starter-security-2.7.17.jar - ├── spring-boot-starter-tomcat-2.7.17.jar - ├── spring-boot-starter-web-2.7.17.jar - ├── spring-context-5.3.30.jar - ├── spring-core-5.3.30.jar - ├── spring-expression-5.3.30.jar - ├── spring-jcl-5.3.30.jar + ├── spring-aop-5.3.31.jar + ├── spring-beans-5.3.31.jar + ├── spring-boot-autoconfigure-2.7.18.jar + ├── spring-boot-starter-logging-2.7.18.jar + ├── spring-boot-starter-security-2.7.18.jar + ├── spring-boot-starter-tomcat-2.7.18.jar + ├── spring-boot-starter-web-2.7.18.jar + ├── spring-context-5.3.31.jar + ├── spring-core-5.3.31.jar + ├── spring-expression-5.3.31.jar + ├── spring-jcl-5.3.31.jar ├── spring-security-config-5.7.11.jar ├── spring-security-web-5.7.11.jar ├── stringtemplate-3.2.1.jar @@ -547,13 +547,13 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to ├── seata-spring-autoconfigure-core-2.1.0-SNAPSHOT.jar ├── simpleclient_httpserver-0.15.0.jar ├── slf4j-api-1.7.36.jar - ├── spring-boot-2.7.17.jar - ├── spring-boot-starter-2.7.17.jar - ├── spring-boot-starter-json-2.7.17.jar + ├── spring-boot-2.7.18.jar + ├── spring-boot-starter-2.7.18.jar + ├── spring-boot-starter-json-2.7.18.jar ├── spring-security-core-5.7.11.jar ├── spring-security-crypto-5.7.11.jar - ├── spring-web-5.3.30.jar - ├── spring-webmvc-5.3.30.jar + ├── spring-web-5.3.31.jar + ├── spring-webmvc-5.3.31.jar ├── xstream-1.4.20.jar └── jdbc ├── mysql-connector-java-8.0.28.jar diff --git a/server/pom.xml b/server/pom.xml index 35328a0a781..9359328870d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -32,60 +32,6 @@ seata-server ${project.version} server for Seata built with Maven - - 2.7.17 - 5.3.30 - 2.0 - 9.0.83 - - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - - - org.springframework - spring-framework-bom - ${spring-framework-for-server.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot-for-server.version} - - - org.springframework - spring-framework-bom - - - pom - import - - - org.yaml - snakeyaml - ${snakeyaml-for-server.version} - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat-embed.version} - - - - @@ -96,21 +42,8 @@ log4j-to-slf4j org.apache.logging.log4j - - org.apache.tomcat.embed - tomcat-embed-core - - - org.yaml - snakeyaml - - - org.yaml - snakeyaml - ${snakeyaml.version} - org.springframework.boot spring-boot-starter-test @@ -261,11 +194,6 @@ com.github.danielwegener logback-kafka-appender - - org.apache.kafka - kafka-clients - ${kafka-clients.version} - com.alipay.sofa jraft-core @@ -284,10 +212,6 @@ org.codehaus.janino janino - - org.apache.tomcat.embed - tomcat-embed-core - @@ -321,31 +245,31 @@ ${dependencies.copy.skip} - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -437,8 +361,6 @@ release-seata - 5.1.42 - 8.0.27 false @@ -447,7 +369,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-for-server.version} + ${spring-boot.version} org.apache.seata.server.ServerApplication ZIP diff --git a/test-mock-server/pom.xml b/test-mock-server/pom.xml index c53af1f7f50..d8b4cb36b35 100644 --- a/test-mock-server/pom.xml +++ b/test-mock-server/pom.xml @@ -55,59 +55,7 @@ - - 2.7.17 - 5.3.30 - 2.0 - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - - - org.springframework - spring-framework-bom - ${spring-framework-for-server.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot-for-server.version} - - - org.springframework - spring-framework-bom - - - org.yaml - snakeyaml - - - pom - import - - - org.yaml - snakeyaml - ${snakeyaml-for-server.version} - - - - - org.apache.seata seata-server @@ -125,5 +73,4 @@ - diff --git a/test/pom.xml b/test/pom.xml index 77560620117..aa325257b0d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -51,36 +51,37 @@ ${project.version} - ${project.groupId} - seata-server + seata-rm-datasource ${project.version} - - - org.apache.seata - seata-spring-autoconfigure-server - - ${project.groupId} - seata-rm-datasource + seata-saga-spring ${project.version} ${project.groupId} - seata-saga-spring + seata-spring ${project.version} + + ${project.groupId} - seata-mock-server + seata-server ${project.version} + + + org.apache.seata + seata-spring-autoconfigure-server + + ${project.groupId} - seata-spring + seata-mock-server ${project.version} From adb9cd7495e9d3da298cb302a66de4783ba5e1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 6 Mar 2024 17:18:13 +0800 Subject: [PATCH 04/52] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compatible/pom.xml | 2 +- server/pom.xml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/compatible/pom.xml b/compatible/pom.xml index ec9e530748b..6f4bb7bf8c1 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -85,7 +85,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 provided diff --git a/server/pom.xml b/server/pom.xml index 9359328870d..8517dae5ba1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -181,10 +181,6 @@ ch.qos.logback logback-classic - - ch.qos.logback - logback-core - net.logstash.logback From 3a7e243a41b0df7b473d3d6af78c6a9716979ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 6 Mar 2024 23:49:54 +0800 Subject: [PATCH 05/52] =?UTF-8?q?=E8=BF=81=E7=A7=BB=20`dependencies`=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=83=A8=E5=88=86=E4=BE=9D=E8=B5=96=E5=88=B0?= =?UTF-8?q?=20`dependencies-client`=20=E5=92=8C=20`dependencies-server`=20?= =?UTF-8?q?=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 14 - build/pom.xml | 4 - console/pom.xml | 4 - dependencies-client/pom.xml | 220 +++++++++++- dependencies-server/pom.xml | 71 +++- dependencies/pom.xml | 659 ++++++++++++------------------------ server/pom.xml | 19 +- 7 files changed, 504 insertions(+), 487 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 7eccd39de36..23a172ebf57 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -416,10 +416,6 @@ edas-sdk provided - - aopalliance - aopalliance - com.101tec zkclient @@ -435,16 +431,6 @@ registry-client-all provided - - com.alipay.sofa - hessian - provided - - - com.alibaba.spring - spring-context-support - provided - com.alibaba.nacos nacos-client diff --git a/build/pom.xml b/build/pom.xml index cda4e3b41bb..c883dce7054 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -75,10 +75,6 @@ UTF-8 UTF-8 - - 5.8.2 - 1.8.2 - 1.1.5 diff --git a/console/pom.xml b/console/pom.xml index 543d2b07316..b2690129b0f 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -55,10 +55,6 @@ javax.servlet javax.servlet-api - io.jsonwebtoken jjwt-api diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index 7b632145ed4..b599ab1b7bf 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -35,13 +35,229 @@ dependencies for Seata client built with Maven - + + 4.8 + + 1.5.9 + 1.12.17 + + + 2.5.9 + 1.0.2 + 2.6.10 + 1.27.1 + 1.8.3 + 1.0.0 + 1.3.2 + 4.0.1 + 5.0.0 + 5.6.5 + + + 1.4.32 + 1.4.3 + + + 2.4.4 + + 5.0.0 - + + + org.antlr + antlr4 + ${antlr4.version} + + + + + io.protostuff + protostuff-core + ${protostuff.version} + + + io.protostuff + protostuff-runtime + ${protostuff.version} + + + + + net.bytebuddy + byte-buddy + ${bytebuddy.version} + + + + + + com.baidu + brpc-java + ${brpc.version} + + + + org.apache.dubbo.extensions + dubbo-filter-seata + ${dubbo-seata.version} + + + + com.alibaba + dubbo + ${dubbo.alibaba.version} + + + + io.grpc + grpc-testing + ${grpc.version} + test + + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + + com.alibaba.edas + edas-sdk + ${hsf.version} + + + junit + junit + + + + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api.version} + + + + com.weibo + motan-core + ${motan.version} + + + slf4j-log4j12 + org.slf4j + + + + + com.weibo + motan-transport-netty + ${motan.version} + + + slf4j-log4j12 + org.slf4j + + + + + + com.alipay.sofa + sofa-rpc-all + ${sofa.rpc.version} + + + net.jcip + jcip-annotations + + + + + + + org.jetbrains.kotlin + kotlin-stdlib-common + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test-common + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + ${kotlin-coroutines.version} + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + ${kotlin-coroutines.version} + + + + + org.codehaus.groovy + groovy-all + ${groovy.version} + + + org.junit.jupiter + junit-jupiter-engine + + + org.junit.platform + junit-platform-launcher + + + + + org.apache.rocketmq rocketmq-client diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index b26ac896e9a..84ca8b9a157 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -35,13 +35,25 @@ dependencies for Seata server and console built with Maven + 2.7.18 - - 5.1.42 - 8.0.27 + + ${mysql.version} + 8.0.27 - + + 1.3.14 + 1.6.7 + + + 0.10.5 + + + 0.6.0 + + + 6.5 0.2.0-RC2 3.6.1 @@ -53,8 +65,49 @@ - - + + + com.alipay.sofa + jraft-core + ${jraft.version} + + + com.alipay.sofa + bolt + ${sofa.bolt.version} + + + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + + + + io.prometheus + simpleclient_httpserver + ${prometheus.client.version} + + + + + + net.logstash.logback + logstash-logback-encoder + ${logstash-logback-encoder.version} + + org.apache.kafka kafka-clients @@ -65,12 +118,6 @@ logback-kafka-appender ${kafka-appender.version} - - - net.logstash.logback - logstash-logback-encoder - ${logstash-logback-encoder.version} - com.beust diff --git a/dependencies/pom.xml b/dependencies/pom.xml index c5819f22ea5..01e3a2508de 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -36,134 +36,179 @@ dependencies for Seata built with Maven - 2.5.15 - - 1.0.2 - 2.5.9 - 1.8.3 - 1.12.17 - 2.6.10 - 5.6.5 - 1.2.83 - 1.5.9 - 1.2.1 - 1.2 + + 1 + 2.6 - 1.0 + 1.2 + 1.21 + + 32.1.3-jre + + 4.1.94.Final + + 1.2.83 + + 3.8.0 + 0.3.1 + 0.11 3.7.2 - 5.1.0 - 1.0.2 - 0.3.1 + + + 1.10.12 + 1.7.1 + 1.5.0-4 + + + 1.2.1 + 2.0 2.0.1 - 1.10.18 - 1.5.4 + + 1.4.2 1.4.6 0.5.0 + + + 1.5.4 1.11.2 - 32.1.3-jre - 1 - 1.3.2 - 4.0.1 - 5.0.0 0.7.6 6.3.0 - 1.0.0 - 1.21 - 1.10.12 - 1.7.1 - 1.3.14 - 4.1.86.Final - 2.0 - 4.1.94.Final - 4.0.3 - 1.6.7 - - 3.16.3 - 1.27.1 - 5.4.0 - 0.45 - 4.0.63 - 2.4.4 - 1.5.0-4 + 1.10.18 + 5.1.0 1.4.20 - 4.4.16 4.5.14 - 0.10.5 - 0.6.0 - 1.3.14 - 6.5 - - - 3.8.0 + + 3.16.3 + 5.4.0 + 0.45 + 4.0.63 - - + + 5.1.42 19.3.0.0 8.1.2.192 42.3.8 1.4.181 2.7.2 - + 1.2.7 2.9.0 3.4.3 - - 4.8 - - ${mysql.version} - 8.0.27 - - 1.4.32 - 1.4.3 + + 1.3.14 - + 4.11.0 3.12.2 + 5.8.2 + 1.8.2 9.4.38.v20210224 3.1.7 2.4.0 + + + 2.5.15 - + - io.netty - netty-all - ${netty.version} + javax.inject + javax.inject + ${javax-inject.version} + + - org.yaml - snakeyaml - ${snakeyaml.version} + commons-lang + commons-lang + ${commons-lang.version} - com.alipay.sofa - hessian - ${sofa.hessian.version} + commons-logging + commons-logging + ${commons-logging.version} - com.alipay.sofa - bolt - ${sofa.bolt.version} + org.apache.commons + commons-compress + ${commons-compress.version} + + + + + com.google.guava + guava + ${guava.version} + + + + io.netty + netty-all + ${netty.version} + + + com.alibaba fastjson ${fastjson.version} + + + + redis.clients + jedis + ${jedis.version} + - org.antlr - antlr4 - ${antlr4.version} + com.github.microwww + redis-server + ${mock-jedis.version} + + + + com.101tec + zkclient + ${zkclient.version} + + + slf4j-log4j12 + org.slf4j + + + io.netty + netty + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + ${apache-zookeeper.version} + + + io.netty + * + + + + + com.alibaba druid @@ -179,6 +224,8 @@ HikariCP ${hikari.version} + + com.h2database h2 @@ -204,113 +251,107 @@ mariadb-java-client ${mariadb.version} + + - com.alipay.sofa - sofa-rpc-all - - - net.jcip - jcip-annotations - - - ${sofa.rpc.version} - - - io.protostuff - protostuff-core - ${protostuff.version} + com.google.protobuf + protobuf-java + ${protobuf.version} + + - io.protostuff - protostuff-runtime - ${protostuff.version} + com.esotericsoftware + kryo + ${kryo.version} - com.typesafe - config - ${config.version} + de.javakaffee + kryo-serializers + ${kryo-serializers.version} - commons-logging - commons-logging - ${commons-logging.version} + com.caucho + hessian + ${hessian.version} + + - commons-lang - commons-lang - ${commons-lang.version} + org.apache.ant + ant + ${ant.version} - com.google.protobuf - protobuf-java - ${protobuf.version} + com.github.luben + zstd-jni + ${zstd.version} - com.baidu - brpc-java - ${brpc.version} + org.lz4 + lz4-java + ${lz4.version} + + + - com.alibaba - dubbo - ${dubbo.alibaba.version} + com.alibaba.nacos + nacos-client + ${nacos-client.version} - org.apache.dubbo.extensions - dubbo-filter-seata - ${dubbo-seata.version} + com.ecwid.consul + consul-api + ${consul-clients.version} - com.alibaba.edas - edas-sdk - ${hsf.version} + io.etcd + jetcd-core + ${etcd-client-v3.version} - junit - junit + io.netty + netty-codec-http - - - - net.bytebuddy - byte-buddy - ${bytebuddy.version} - - - aopalliance - aopalliance - ${aopalliance.version} - - - com.101tec - zkclient - ${zkclient.version} - - slf4j-log4j12 - org.slf4j + io.netty + netty-codec-http2 io.netty - netty + netty-handler-proxy - org.apache.zookeeper - zookeeper + io.netty + netty-handler - - - - org.apache.zookeeper - zookeeper - ${apache-zookeeper.version} - - io.netty - * + com.google.guava + guava + + + + + com.typesafe + config + ${config.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + com.ctrip.framework.apollo + apollo-client + ${apollo-client.version} + + + org.apache.curator curator-test @@ -331,54 +372,6 @@ - - com.alipay.sofa - registry-test - ${sofa.registry.version} - - - log4j-over-slf4j - org.slf4j - - - log4j-jcl - org.apache.logging.log4j - - - log4j-core - org.apache.logging.log4j - - - log4j-api - org.apache.logging.log4j - - - - - com.alibaba.spring - spring-context-support - ${spring-context-support.version} - - - com.alibaba.nacos - nacos-client - ${nacos-client.version} - - - com.ctrip.framework.apollo - apollo-client - ${apollo-client.version} - - - redis.clients - jedis - ${jedis.version} - - - com.github.microwww - redis-server - ${mock-jedis.version} - com.netflix.eureka eureka-client @@ -404,43 +397,6 @@ archaius-core ${archaius-core.version} - - com.ecwid.consul - consul-api - ${consul-clients.version} - - - io.etcd - jetcd-core - ${etcd-client-v3.version} - - - io.netty - netty-codec-http - - - io.netty - netty-codec-http2 - - - io.netty - netty-handler-proxy - - - io.netty - netty-handler - - - com.google.guava - guava - - - - - com.google.guava - guava - ${guava.version} - io.etcd jetcd-launcher @@ -462,203 +418,6 @@ native-lib-loader ${native-lib-loader.version} - - javax.inject - javax.inject - ${javax-inject.version} - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet-api.version} - - - com.weibo - motan-core - ${motan.version} - - - slf4j-log4j12 - org.slf4j - - - - - com.weibo - motan-transport-netty - ${motan.version} - - - slf4j-log4j12 - org.slf4j - - - - - - io.grpc - grpc-testing - ${grpc.version} - test - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - com.esotericsoftware - kryo - ${kryo.version} - - - de.javakaffee - kryo-serializers - ${kryo-serializers.version} - - - com.caucho - hessian - ${hessian.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - org.apache.ant - ant - ${ant.version} - - - org.lz4 - lz4-java - ${lz4.version} - - - org.jetbrains.kotlin - kotlin-stdlib-common - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-jdk7 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test-common - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - ${kotlin-coroutines.version} - - - org.jetbrains.kotlinx - kotlinx-coroutines-core-jvm - ${kotlin-coroutines.version} - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - org.junit.jupiter - junit-jupiter-engine - - - org.junit.platform - junit-platform-launcher - - - - - com.alipay.sofa - jraft-core - ${jraft.version} - - - com.github.luben - zstd-jni - ${zstd.version} - - - - - io.jsonwebtoken - jjwt-api - ${jwt.version} - - - io.jsonwebtoken - jjwt-impl - ${jwt.version} - - - io.jsonwebtoken - jjwt-jackson - ${jwt.version} - - - io.prometheus - simpleclient_httpserver - ${prometheus.client.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - - com.thoughtworks.xstream xstream @@ -674,6 +433,16 @@ + + org.eclipse.jetty + jetty-security + ${jetty-version} + + + org.eclipse.jetty + jetty-servlet + ${jetty-version} + org.apache.httpcomponents httpcore @@ -684,18 +453,21 @@ httpclient ${httpclient.version} + + + - org.eclipse.jetty - jetty-security - ${jetty-version} + ch.qos.logback + logback-classic + ${logback.version} - org.eclipse.jetty - jetty-servlet - ${jetty-version} + ch.qos.logback + logback-core + ${logback.version} - + org.mockito @@ -799,7 +571,9 @@ false Apache License, Version 2.0|The Apache Software License, Version - 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0 + 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License + v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software + License, Version 2.0 The MIT License|MIT License The 3-Clause BSD License|New BSD License|3-Clause BSD @@ -882,7 +656,8 @@ validate ${user.dir}/style/seata_checkstyle.xml - ${user.dir}/style/seata_suppressions.xml + ${user.dir}/style/seata_suppressions.xml + UTF-8 true true diff --git a/server/pom.xml b/server/pom.xml index 8517dae5ba1..1ef52f9eb1f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -105,7 +105,7 @@ ${project.version} - + com.alibaba druid @@ -118,20 +118,21 @@ com.zaxxer HikariCP + com.h2database h2 - + mysql mysql-connector-java - - - - - + org.postgresql postgresql @@ -252,12 +253,12 @@ mysql mysql-connector-java - ${mysql.jdbc.version} + ${mysql5.version} mysql mysql-connector-java - ${mysql8.jdbc.version} + ${mysql8.version} From a50e25c17ca5189b2e2e9a9367e9173fd56606b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 6 Mar 2024 23:56:42 +0800 Subject: [PATCH 06/52] =?UTF-8?q?=E5=B0=86=20`/build/pom.xml`=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E8=BF=81=E7=A7=BB=E5=88=B0=E9=A1=B6?= =?UTF-8?q?=E5=B1=82=20`/pom.xml`=20=E4=B8=AD=EF=BC=8C=E5=B9=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20`build`=20=E6=A8=A1=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bom/pom.xml | 3 +- build/pom.xml | 452 ------------------------------------------- dependencies/pom.xml | 3 +- pom.xml | 433 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 427 insertions(+), 464 deletions(-) delete mode 100644 build/pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 514d4f048bb..06b8872533c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-build + seata-parent ${revision} - ../build/pom.xml 4.0.0 diff --git a/build/pom.xml b/build/pom.xml deleted file mode 100644 index c883dce7054..00000000000 --- a/build/pom.xml +++ /dev/null @@ -1,452 +0,0 @@ - - - - 4.0.0 - - org.apache.seata - seata-build - pom - ${revision} - - Seata Build ${project.version} - plugin management for Seata built with Maven - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - Apache - https://github.com/apache - - - https://seata.apache.org - - - - Seata - Seata - https://seata.apache.org - dev@seata.apache.org - - - - - github - https://github.com/apache/incubator-seata/issues - - - - git@github.com:apache/incubator-seata.git - scm:git@github.com:apache/incubator-seata.git - scm:git@github.com:apache/incubator-seata.git - - - - - 2.1.0-SNAPSHOT - - - 1.8 - ${java.version} - ${java.version} - UTF-8 - UTF-8 - - - - 1.1.5 - 3.1.0 - - 3.8.1 - 0.6.1 - 1.9.21 - - 3.8 - 1.3.6 - 3.0.0 - 4.0 - 1.20 - 3.1.1 - 3.0.0-M3 - - 3.0.0-M5 - 0.8.7 - - 2.2.1 - 3.2.0 - 3.2.2 - 2.4.3 - 3.0.2 - 3.0.0 - 3.2.0 - 4.9.10 - 1.15.0 - - 2.8.2 - 1.6.7 - 1.6 - - 1.8 - 1.5.0.Final - - - true - true - true - false - false - - - 37F181C60AACE24BD5C1D3925583F79497E8E293 - - - - - true - ${IMAGE_NAME} - latest - - true - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.plugins - maven-shade-plugin - ${maven-shade-plugin.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.xolstice.maven.plugins - protobuf-maven-plugin - ${protobuf-maven-plugin.version} - - - true - - - - com.mycila - license-maven-plugin - ${license-maven-plugin.version} - - - org.codehaus.mojo - license-maven-plugin - ${mojo-license-maven-plugin.version} - - - icu.easyj.maven.plugins - easyj-maven-plugin - ${easyj-maven-plugin.version} - - - - simplify-pom - - simplify-pom - - - - - .flattened-pom.xml - true - - - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - - get-the-git-infos - - revision - - - - - ${maven.git-commit-id.skip} - true - yyyy-MM-dd'T'HH:mm:ssZ - true - ${project.build.outputDirectory}/seata-git.properties - - git.commit.message.full - git.remote.origin.url - git.branch - ^git.build.(time|version)$ - ^git.commit.(id|time)$ - git.dirty - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - ${project.build.sourceEncoding} - true - - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - ${project.build.sourceEncoding} - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - true - true - - true - true - - - ${maven.build.timestamp} - - - - **/META-INF/additional-spring-configuration-metadata.json - protobuf/** - **/*.proto - static/console-fe/** - - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - - - ./ - - *-pom.xml - **/db_store/** - **/sessionStore/** - **/root.data - - false - - - - - - - icu.easyj.maven.plugins - easyj-maven-plugin - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - enforce-maven - - enforce - - - - - [3.6.0,) - - - - - - - - - pl.project13.maven - git-commit-id-plugin - - - - - - - - release - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} - false - - - - package - - jar - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - oss_seata - https://oss.sonatype.org/ - false - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - ${gpg.keyname} - - ${gpg.arg1} - ${gpg.arg2} - - - - - - - - - - - oss_seata - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss_seata - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - release-by-github-actions - - --pinentry-mode - loopback - - - - - - args-for-test-by-jdk17-and-above - - [17,) - - - - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.net=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens java.base/java.text=ALL-UNNAMED - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.util.regex=ALL-UNNAMED - --add-opens java.base/java.util.concurrent=ALL-UNNAMED - - --add-opens java.sql/java.sql=ALL-UNNAMED - --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED - - -Dnet.bytebuddy.experimental=true - - - - - - - args-for-client-test - - org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java - - - - diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 01e3a2508de..0269c0cbdb2 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-build + seata-parent ${revision} - ../build/pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e218cd270cc..dddad5127d7 100644 --- a/pom.xml +++ b/pom.xml @@ -20,21 +20,17 @@ - - org.apache.seata - seata-build - ${revision} - ./build/pom.xml - 4.0.0 + org.apache.seata seata-parent pom + ${revision} + Seata Parent POM ${project.version} - parent for Seata built with Maven + parent and plugin management for Seata built with Maven - build all bom common @@ -70,4 +66,425 @@ integration-tx-api + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + Apache + https://github.com/apache + + + https://seata.apache.org + + + + Seata + Seata + https://seata.apache.org + dev@seata.apache.org + + + + + github + https://github.com/apache/incubator-seata/issues + + + + git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + + + + + 2.1.0-SNAPSHOT + + + 1.8 + ${java.version} + ${java.version} + UTF-8 + UTF-8 + + + + 1.1.5 + 3.1.0 + + 3.8.1 + 0.6.1 + 1.9.21 + + 3.8 + 1.3.6 + 3.0.0 + 4.0 + 1.20 + 3.1.1 + 3.0.0-M3 + + 3.0.0-M5 + 0.8.7 + + 2.2.1 + 3.2.0 + 3.2.2 + 2.4.3 + 3.0.2 + 3.0.0 + 3.2.0 + 4.9.10 + 1.15.0 + + 2.8.2 + 1.6.7 + 1.6 + + 1.8 + 1.5.0.Final + + + true + true + true + false + false + + + 37F181C60AACE24BD5C1D3925583F79497E8E293 + + + + + true + ${IMAGE_NAME} + latest + + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + + true + + + + com.mycila + license-maven-plugin + ${license-maven-plugin.version} + + + org.codehaus.mojo + license-maven-plugin + ${mojo-license-maven-plugin.version} + + + icu.easyj.maven.plugins + easyj-maven-plugin + ${easyj-maven-plugin.version} + + + + simplify-pom + + simplify-pom + + + + + .flattened-pom.xml + true + + + + pl.project13.maven + git-commit-id-plugin + ${git-commit-id-plugin.version} + + + get-the-git-infos + + revision + + + + + ${maven.git-commit-id.skip} + true + yyyy-MM-dd'T'HH:mm:ssZ + true + ${project.build.outputDirectory}/seata-git.properties + + git.commit.message.full + git.remote.origin.url + git.branch + ^git.build.(time|version)$ + ^git.commit.(id|time)$ + git.dirty + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + ${project.build.sourceEncoding} + true + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + true + true + + true + true + + + ${maven.build.timestamp} + + + + **/META-INF/additional-spring-configuration-metadata.json + protobuf/** + **/*.proto + static/console-fe/** + + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + + ./ + + *-pom.xml + **/db_store/** + **/sessionStore/** + **/root.data + + false + + + + + + + icu.easyj.maven.plugins + easyj-maven-plugin + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-maven + + enforce + + + + + [3.6.0,) + + + + + + + + + pl.project13.maven + git-commit-id-plugin + + + + + + + + release + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + ${project.build.sourceEncoding} + false + + + + package + + jar + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true + + oss_seata + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + + ${gpg.arg1} + ${gpg.arg2} + + + + + + + + + + + oss_seata + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss_seata + https://oss.sonatype.org/content/repositories/snapshots + + + + + + + release-by-github-actions + + --pinentry-mode + loopback + + + + + + args-for-test-by-jdk17-and-above + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED + --add-opens java.base/java.math=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.regex=ALL-UNNAMED + --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + --add-opens java.sql/java.sql=ALL-UNNAMED + --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED + + -Dnet.bytebuddy.experimental=true + + + + + + + args-for-client-test + + org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java + + + From 95af31dda47ba950274e71a22103b58c11dbac07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 00:09:53 +0800 Subject: [PATCH 07/52] =?UTF-8?q?com.alipay.sofa:bolt=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=B8=BA1.6.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 0269c0cbdb2..85c921ab209 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -74,6 +74,7 @@ 1.11.2 0.7.6 6.3.0 + 1.6.7 1.10.18 5.1.0 1.4.20 @@ -371,6 +372,11 @@ + + com.alipay.sofa + bolt + ${sofa.bolt.version} + com.netflix.eureka eureka-client From 91940afade9d57636a9f4b922e42755fc084af12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 00:12:03 +0800 Subject: [PATCH 08/52] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-server/pom.xml | 6 ------ server/pom.xml | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 84ca8b9a157..0a10804ebd4 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -44,7 +44,6 @@ 1.3.14 - 1.6.7 0.10.5 @@ -71,11 +70,6 @@ jraft-core ${jraft.version} - - com.alipay.sofa - bolt - ${sofa.bolt.version} - diff --git a/server/pom.xml b/server/pom.xml index 1ef52f9eb1f..0d82b54c882 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -194,16 +194,6 @@ com.alipay.sofa jraft-core - - - com.alipay.sofa - bolt - - - - - com.alipay.sofa - bolt org.codehaus.janino From 89971b07daf329f55c0e6c52d8135b5222978f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 00:27:12 +0800 Subject: [PATCH 09/52] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=20sofa.hessian=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA4.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 85c921ab209..306607d8dd7 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -74,6 +74,7 @@ 1.11.2 0.7.6 6.3.0 + 4.0.4 1.6.7 1.10.18 5.1.0 @@ -372,6 +373,11 @@ + + com.alipay.sofa + hessian + ${sofa.hessian.version} + com.alipay.sofa bolt From 2278f6a90645badf8630260a6892bd759f062913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 00:29:59 +0800 Subject: [PATCH 10/52] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=20sofa.hessian=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA4.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 306607d8dd7..cd6bce6919e 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -74,7 +74,7 @@ 1.11.2 0.7.6 6.3.0 - 4.0.4 + 4.0.3 1.6.7 1.10.18 5.1.0 From 7d43f765e958e36e15b8efdbbe27a768ae01dabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 00:51:01 +0800 Subject: [PATCH 11/52] =?UTF-8?q?=E4=BC=98=E5=8C=96seata-all=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=85=B6=E7=BB=A7=E6=89=BF=E4=BA=86test=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 23a172ebf57..bcec284076a 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies-client + seata-parent ${revision} - ../dependencies-client/pom.xml + ../pom.xml 4.0.0 @@ -32,6 +32,18 @@ Seata All-in-one ${project.version} Seata is an easy-to-use, high-performance, java based, open source distributed transaction solution. + + + + org.apache.seata + seata-dependencies-client + ${project.version} + pom + import + + + + From 36c912f1c5e7f6a101217fc98e1e975409e6619f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 02:03:31 +0800 Subject: [PATCH 12/52] =?UTF-8?q?=E8=AF=95=E4=B8=80=E4=B8=8B=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=A0=BC=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/pom.xml | 452 ++++++++++++ common/pom.xml | 4 +- compressor/pom.xml | 4 +- config/pom.xml | 4 +- core/pom.xml | 4 +- dependencies-client/pom.xml | 21 +- dependencies-server/pom.xml | 29 +- dependencies/pom.xml | 284 +------- discovery/pom.xml | 4 +- pom.xml | 655 +++++++----------- .../seata-spring-autoconfigure-core/pom.xml | 4 +- serializer/pom.xml | 4 +- 12 files changed, 776 insertions(+), 693 deletions(-) create mode 100644 build/pom.xml diff --git a/build/pom.xml b/build/pom.xml new file mode 100644 index 00000000000..c883dce7054 --- /dev/null +++ b/build/pom.xml @@ -0,0 +1,452 @@ + + + + 4.0.0 + + org.apache.seata + seata-build + pom + ${revision} + + Seata Build ${project.version} + plugin management for Seata built with Maven + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + Apache + https://github.com/apache + + + https://seata.apache.org + + + + Seata + Seata + https://seata.apache.org + dev@seata.apache.org + + + + + github + https://github.com/apache/incubator-seata/issues + + + + git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + + + + + 2.1.0-SNAPSHOT + + + 1.8 + ${java.version} + ${java.version} + UTF-8 + UTF-8 + + + + 1.1.5 + 3.1.0 + + 3.8.1 + 0.6.1 + 1.9.21 + + 3.8 + 1.3.6 + 3.0.0 + 4.0 + 1.20 + 3.1.1 + 3.0.0-M3 + + 3.0.0-M5 + 0.8.7 + + 2.2.1 + 3.2.0 + 3.2.2 + 2.4.3 + 3.0.2 + 3.0.0 + 3.2.0 + 4.9.10 + 1.15.0 + + 2.8.2 + 1.6.7 + 1.6 + + 1.8 + 1.5.0.Final + + + true + true + true + false + false + + + 37F181C60AACE24BD5C1D3925583F79497E8E293 + + + + + true + ${IMAGE_NAME} + latest + + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + + true + + + + com.mycila + license-maven-plugin + ${license-maven-plugin.version} + + + org.codehaus.mojo + license-maven-plugin + ${mojo-license-maven-plugin.version} + + + icu.easyj.maven.plugins + easyj-maven-plugin + ${easyj-maven-plugin.version} + + + + simplify-pom + + simplify-pom + + + + + .flattened-pom.xml + true + + + + pl.project13.maven + git-commit-id-plugin + ${git-commit-id-plugin.version} + + + get-the-git-infos + + revision + + + + + ${maven.git-commit-id.skip} + true + yyyy-MM-dd'T'HH:mm:ssZ + true + ${project.build.outputDirectory}/seata-git.properties + + git.commit.message.full + git.remote.origin.url + git.branch + ^git.build.(time|version)$ + ^git.commit.(id|time)$ + git.dirty + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + ${project.build.sourceEncoding} + true + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + true + true + + true + true + + + ${maven.build.timestamp} + + + + **/META-INF/additional-spring-configuration-metadata.json + protobuf/** + **/*.proto + static/console-fe/** + + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + + ./ + + *-pom.xml + **/db_store/** + **/sessionStore/** + **/root.data + + false + + + + + + + icu.easyj.maven.plugins + easyj-maven-plugin + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-maven + + enforce + + + + + [3.6.0,) + + + + + + + + + pl.project13.maven + git-commit-id-plugin + + + + + + + + release + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + ${project.build.sourceEncoding} + false + + + + package + + jar + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true + + oss_seata + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + + ${gpg.arg1} + ${gpg.arg2} + + + + + + + + + + + oss_seata + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss_seata + https://oss.sonatype.org/content/repositories/snapshots + + + + + + + release-by-github-actions + + --pinentry-mode + loopback + + + + + + args-for-test-by-jdk17-and-above + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED + --add-opens java.base/java.math=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.regex=ALL-UNNAMED + --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + --add-opens java.sql/java.sql=ALL-UNNAMED + --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED + + -Dnet.bytebuddy.experimental=true + + + + + + + args-for-client-test + + org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java + + + + diff --git a/common/pom.xml b/common/pom.xml index ac310c43cb3..a0c30afd683 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml + ../pom.xml 4.0.0 seata-common diff --git a/compressor/pom.xml b/compressor/pom.xml index a94e0ebc1a5..664bba46c18 100644 --- a/compressor/pom.xml +++ b/compressor/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml + ../pom.xml 4.0.0 seata-compressor diff --git a/config/pom.xml b/config/pom.xml index 467a07827e8..5b96935364f 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml + ../pom.xml 4.0.0 seata-config diff --git a/core/pom.xml b/core/pom.xml index 15c6987767d..2c5a0c461a2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml + ../pom.xml 4.0.0 seata-core diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index b599ab1b7bf..c1083ca2524 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml 4.0.0 @@ -263,6 +262,24 @@ rocketmq-client ${rocketmq-version} + + + + ${project.groupId} + seata-dependencies + ${project.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 0a10804ebd4..65a9dd2e51b 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml 4.0.0 @@ -35,11 +34,8 @@ dependencies for Seata server and console built with Maven - - 2.7.18 - - ${mysql.version} + 5.1.42 8.0.27 @@ -60,6 +56,9 @@ 3.1.7 + + + 2.7.18 @@ -125,6 +124,24 @@ janino ${janino-version} + + + + ${project.groupId} + seata-dependencies + ${project.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + diff --git a/dependencies/pom.xml b/dependencies/pom.xml index cd6bce6919e..b51e834c1d6 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-build ${revision} + ../build/pom.xml 4.0.0 @@ -113,9 +114,6 @@ 9.4.38.v20210224 3.1.7 2.4.0 - - - 2.5.15 @@ -509,284 +507,6 @@ pom import - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.platform - junit-platform-launcher - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - org.mockito - mockito-inline - test - - - org.assertj - assertj-core - test - - - org.slf4j - slf4j-simple - test - - - - - - - licenseCheck - - - - org.codehaus.mojo - license-maven-plugin - - - license-check - generate-sources - - add-third-party - - - false - false - false - - Apache License, Version 2.0|The Apache Software License, Version - 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License - v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software - License, Version 2.0 - - The MIT License|MIT License - The 3-Clause BSD License|New BSD License|3-Clause BSD - License|BSD|3-Clause BSD License|The New BSD License - - - - - - - - - - - - arrch64 - - osx-x86_64 - - - - - checkstyle - - [1.8,) - - - - - com.mycila - license-maven-plugin - - - generate-sources - - remove - format - - - - - true -
${user.dir}/style/copyright
- - **/src/main/java/** - **/src/test/java/** - **/*.xml - **/*.sql - **/*.conf - **/*.yml - **/*.yaml - **/*.sh - **/*.bat - **/*.lua - **/*.properties - **/*.txt - **/*.def - - - **/generated/** - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - true - - SLASHSTAR_STYLE - DOUBLEBAR_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - validate - validate - - ${user.dir}/style/seata_checkstyle.xml - ${user.dir}/style/seata_suppressions.xml - - UTF-8 - true - true - - - checkstyle - - - - - - - - - - - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - **/*.java.template - - - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - ${project.build.sourceEncoding} - 2 - true - - rulesets/java/ali-comment.xml - rulesets/java/ali-concurrent.xml - rulesets/java/ali-constant.xml - rulesets/java/ali-exception.xml - rulesets/java/ali-flowcontrol.xml - rulesets/java/ali-naming.xml - rulesets/java/ali-oop.xml - rulesets/java/ali-orm.xml - rulesets/java/ali-other.xml - rulesets/java/ali-set.xml - - - **/generated/*.java - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - - - - pmd-check - validate - - check - - - - - - com.alibaba.p3c - p3c-pmd - ${p3c-pmd.version} - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${maven.surefire.argLine} - ${maven.surefire.excludes} - - - - diff --git a/discovery/pom.xml b/discovery/pom.xml index 674402655d5..46f9ba9c346 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml + ../pom.xml 4.0.0 pom diff --git a/pom.xml b/pom.xml index dddad5127d7..c0c7b55a27c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,17 +20,22 @@ + + org.apache.seata + seata-build + ${revision} + ./build/pom.xml + 4.0.0 - org.apache.seata seata-parent pom - ${revision} Seata Parent POM ${project.version} - parent and plugin management for Seata built with Maven + parent for Seata built with Maven + build all bom common @@ -67,424 +72,296 @@ - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - Apache - https://github.com/apache - - - https://seata.apache.org - - - - Seata - Seata - https://seata.apache.org - dev@seata.apache.org - - - - - github - https://github.com/apache/incubator-seata/issues - - - - git@github.com:apache/incubator-seata.git - scm:git@github.com:apache/incubator-seata.git - scm:git@github.com:apache/incubator-seata.git - - - - 2.1.0-SNAPSHOT - - - 1.8 - ${java.version} - ${java.version} - UTF-8 - UTF-8 - - - - 1.1.5 - 3.1.0 - - 3.8.1 - 0.6.1 - 1.9.21 - - 3.8 - 1.3.6 - 3.0.0 - 4.0 - 1.20 - 3.1.1 - 3.0.0-M3 - - 3.0.0-M5 - 0.8.7 - - 2.2.1 - 3.2.0 - 3.2.2 - 2.4.3 - 3.0.2 - 3.0.0 - 3.2.0 - 4.9.10 - 1.15.0 - - 2.8.2 - 1.6.7 - 1.6 - - 1.8 - 1.5.0.Final - - - true - true - true - false - false - - - 37F181C60AACE24BD5C1D3925583F79497E8E293 - - - - - true - ${IMAGE_NAME} - latest - - true + + 2.5.15 - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.plugins - maven-shade-plugin - ${maven-shade-plugin.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.xolstice.maven.plugins - protobuf-maven-plugin - ${protobuf-maven-plugin.version} - - - true - - - - com.mycila - license-maven-plugin - ${license-maven-plugin.version} - - - org.codehaus.mojo - license-maven-plugin - ${mojo-license-maven-plugin.version} - - - icu.easyj.maven.plugins - easyj-maven-plugin - ${easyj-maven-plugin.version} - - - - simplify-pom - - simplify-pom - - - - - .flattened-pom.xml - true - - - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - - get-the-git-infos - - revision - - - - - ${maven.git-commit-id.skip} - true - yyyy-MM-dd'T'HH:mm:ssZ - true - ${project.build.outputDirectory}/seata-git.properties - - git.commit.message.full - git.remote.origin.url - git.branch - ^git.build.(time|version)$ - ^git.commit.(id|time)$ - git.dirty - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - - + + + + + ${project.groupId} + seata-dependencies + ${project.version} + pom + import + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - ${project.build.sourceEncoding} - true - - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - ${project.build.sourceEncoding} - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - true - true - - true - true - - - ${maven.build.timestamp} - - - - **/META-INF/additional-spring-configuration-metadata.json - protobuf/** - **/*.proto - static/console-fe/** - - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - - - ./ - - *-pom.xml - **/db_store/** - **/sessionStore/** - **/root.data - - false - - - - - - - icu.easyj.maven.plugins - easyj-maven-plugin - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - enforce-maven - - enforce - - - - - [3.6.0,) - - - - - - - - - pl.project13.maven - git-commit-id-plugin - - - + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.platform + junit-platform-launcher + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.mockito + mockito-inline + test + + + org.assertj + assertj-core + test + + + org.slf4j + slf4j-simple + test + + - + - release + licenseCheck - - org.apache.maven.plugins - maven-javadoc-plugin - - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} - false - + org.codehaus.mojo + license-maven-plugin - package + license-check + generate-sources - jar + add-third-party + + false + false + false + + Apache License, Version 2.0|The Apache Software License, Version + 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0 + + The MIT License|MIT License + The 3-Clause BSD License|New BSD License|3-Clause BSD + License|BSD|3-Clause BSD License|The New BSD License + + + - + + + + + + arrch64 + + osx-x86_64 + + + + + checkstyle + + [1.8,) + + + - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true + com.mycila + license-maven-plugin + + + generate-sources + + remove + format + + + - oss_seata - https://oss.sonatype.org/ - false + true +
${user.dir}/style/copyright
+ + **/src/main/java/** + **/src/test/java/** + **/*.xml + **/*.sql + **/*.conf + **/*.yml + **/*.yaml + **/*.sh + **/*.bat + **/*.lua + **/*.properties + **/*.txt + **/*.def + + + **/generated/** + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + true + + SLASHSTAR_STYLE + DOUBLEBAR_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} + maven-checkstyle-plugin - sign-artifacts - verify - - sign - + validate + validate - ${gpg.keyname} - - ${gpg.arg1} - ${gpg.arg2} - + ${user.dir}/style/seata_checkstyle.xml + ${user.dir}/style/seata_suppressions.xml + UTF-8 + true + true + + checkstyle + - - - - oss_seata - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss_seata - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - release-by-github-actions - - --pinentry-mode - loopback - - - - - - args-for-test-by-jdk17-and-above - - [17,) - - - - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.net=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens java.base/java.text=ALL-UNNAMED - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.util.regex=ALL-UNNAMED - --add-opens java.base/java.util.concurrent=ALL-UNNAMED - - --add-opens java.sql/java.sql=ALL-UNNAMED - --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED - - -Dnet.bytebuddy.experimental=true - - - - - - - args-for-client-test - - org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java - + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + **/*.java.template + + + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + ${project.build.sourceEncoding} + 2 + true + + rulesets/java/ali-comment.xml + rulesets/java/ali-concurrent.xml + rulesets/java/ali-constant.xml + rulesets/java/ali-exception.xml + rulesets/java/ali-flowcontrol.xml + rulesets/java/ali-naming.xml + rulesets/java/ali-oop.xml + rulesets/java/ali-orm.xml + rulesets/java/ali-other.xml + rulesets/java/ali-set.xml + + + **/generated/*.java + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + + + + pmd-check + validate + + check + + + + + + com.alibaba.p3c + p3c-pmd + ${p3c-pmd.version} + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + test + + report + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + ${maven.surefire.argLine} + ${maven.surefire.excludes} + + + + diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml index 2b8c30a74d3..0703d7a55c7 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../../dependencies/pom.xml + ../../pom.xml 4.0.0 diff --git a/serializer/pom.xml b/serializer/pom.xml index 6a77926e99d..01171e09aa4 100644 --- a/serializer/pom.xml +++ b/serializer/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-parent ${revision} - ../dependencies/pom.xml + ../pom.xml 4.0.0 seata-serializer From 6fcf0b63cd0ca9dfd622f22ce22104de37753d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 02:08:53 +0800 Subject: [PATCH 13/52] =?UTF-8?q?Revert=20"=E8=AF=95=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=A0=BC=E5=BC=8F=E3=80=82"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 36c912f1c5e7f6a101217fc98e1e975409e6619f. --- build/pom.xml | 452 ------------ common/pom.xml | 4 +- compressor/pom.xml | 4 +- config/pom.xml | 4 +- core/pom.xml | 4 +- dependencies-client/pom.xml | 21 +- dependencies-server/pom.xml | 29 +- dependencies/pom.xml | 284 +++++++- discovery/pom.xml | 4 +- pom.xml | 655 +++++++++++------- .../seata-spring-autoconfigure-core/pom.xml | 4 +- serializer/pom.xml | 4 +- 12 files changed, 693 insertions(+), 776 deletions(-) delete mode 100644 build/pom.xml diff --git a/build/pom.xml b/build/pom.xml deleted file mode 100644 index c883dce7054..00000000000 --- a/build/pom.xml +++ /dev/null @@ -1,452 +0,0 @@ - - - - 4.0.0 - - org.apache.seata - seata-build - pom - ${revision} - - Seata Build ${project.version} - plugin management for Seata built with Maven - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - Apache - https://github.com/apache - - - https://seata.apache.org - - - - Seata - Seata - https://seata.apache.org - dev@seata.apache.org - - - - - github - https://github.com/apache/incubator-seata/issues - - - - git@github.com:apache/incubator-seata.git - scm:git@github.com:apache/incubator-seata.git - scm:git@github.com:apache/incubator-seata.git - - - - - 2.1.0-SNAPSHOT - - - 1.8 - ${java.version} - ${java.version} - UTF-8 - UTF-8 - - - - 1.1.5 - 3.1.0 - - 3.8.1 - 0.6.1 - 1.9.21 - - 3.8 - 1.3.6 - 3.0.0 - 4.0 - 1.20 - 3.1.1 - 3.0.0-M3 - - 3.0.0-M5 - 0.8.7 - - 2.2.1 - 3.2.0 - 3.2.2 - 2.4.3 - 3.0.2 - 3.0.0 - 3.2.0 - 4.9.10 - 1.15.0 - - 2.8.2 - 1.6.7 - 1.6 - - 1.8 - 1.5.0.Final - - - true - true - true - false - false - - - 37F181C60AACE24BD5C1D3925583F79497E8E293 - - - - - true - ${IMAGE_NAME} - latest - - true - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.plugins - maven-shade-plugin - ${maven-shade-plugin.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.xolstice.maven.plugins - protobuf-maven-plugin - ${protobuf-maven-plugin.version} - - - true - - - - com.mycila - license-maven-plugin - ${license-maven-plugin.version} - - - org.codehaus.mojo - license-maven-plugin - ${mojo-license-maven-plugin.version} - - - icu.easyj.maven.plugins - easyj-maven-plugin - ${easyj-maven-plugin.version} - - - - simplify-pom - - simplify-pom - - - - - .flattened-pom.xml - true - - - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - - get-the-git-infos - - revision - - - - - ${maven.git-commit-id.skip} - true - yyyy-MM-dd'T'HH:mm:ssZ - true - ${project.build.outputDirectory}/seata-git.properties - - git.commit.message.full - git.remote.origin.url - git.branch - ^git.build.(time|version)$ - ^git.commit.(id|time)$ - git.dirty - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - ${project.build.sourceEncoding} - true - - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - ${project.build.sourceEncoding} - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - true - true - - true - true - - - ${maven.build.timestamp} - - - - **/META-INF/additional-spring-configuration-metadata.json - protobuf/** - **/*.proto - static/console-fe/** - - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - - - ./ - - *-pom.xml - **/db_store/** - **/sessionStore/** - **/root.data - - false - - - - - - - icu.easyj.maven.plugins - easyj-maven-plugin - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - enforce-maven - - enforce - - - - - [3.6.0,) - - - - - - - - - pl.project13.maven - git-commit-id-plugin - - - - - - - - release - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} - false - - - - package - - jar - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - oss_seata - https://oss.sonatype.org/ - false - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - ${gpg.keyname} - - ${gpg.arg1} - ${gpg.arg2} - - - - - - - - - - - oss_seata - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss_seata - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - release-by-github-actions - - --pinentry-mode - loopback - - - - - - args-for-test-by-jdk17-and-above - - [17,) - - - - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.net=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens java.base/java.text=ALL-UNNAMED - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.util.regex=ALL-UNNAMED - --add-opens java.base/java.util.concurrent=ALL-UNNAMED - - --add-opens java.sql/java.sql=ALL-UNNAMED - --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED - - -Dnet.bytebuddy.experimental=true - - - - - - - args-for-client-test - - org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java - - - - diff --git a/common/pom.xml b/common/pom.xml index a0c30afd683..ac310c43cb3 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../pom.xml + ../dependencies/pom.xml 4.0.0 seata-common diff --git a/compressor/pom.xml b/compressor/pom.xml index 664bba46c18..a94e0ebc1a5 100644 --- a/compressor/pom.xml +++ b/compressor/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../pom.xml + ../dependencies/pom.xml 4.0.0 seata-compressor diff --git a/config/pom.xml b/config/pom.xml index 5b96935364f..467a07827e8 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../pom.xml + ../dependencies/pom.xml 4.0.0 seata-config diff --git a/core/pom.xml b/core/pom.xml index 2c5a0c461a2..15c6987767d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../pom.xml + ../dependencies/pom.xml 4.0.0 seata-core diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index c1083ca2524..b599ab1b7bf 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 @@ -262,24 +263,6 @@ rocketmq-client ${rocketmq-version} - - - - ${project.groupId} - seata-dependencies - ${project.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 65a9dd2e51b..0a10804ebd4 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -22,8 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} + ../dependencies/pom.xml 4.0.0 @@ -34,8 +35,11 @@ dependencies for Seata server and console built with Maven + + 2.7.18 + - 5.1.42 + ${mysql.version} 8.0.27 @@ -56,9 +60,6 @@ 3.1.7 - - - 2.7.18 @@ -124,24 +125,6 @@ janino ${janino-version} - - - - ${project.groupId} - seata-dependencies - ${project.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - diff --git a/dependencies/pom.xml b/dependencies/pom.xml index b51e834c1d6..cd6bce6919e 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-build + seata-parent ${revision} - ../build/pom.xml 4.0.0 @@ -114,6 +113,9 @@ 9.4.38.v20210224 3.1.7 2.4.0 + + + 2.5.15 @@ -507,6 +509,284 @@ pom import + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.platform + junit-platform-launcher + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.mockito + mockito-inline + test + + + org.assertj + assertj-core + test + + + org.slf4j + slf4j-simple + test + + + + + + + licenseCheck + + + + org.codehaus.mojo + license-maven-plugin + + + license-check + generate-sources + + add-third-party + + + false + false + false + + Apache License, Version 2.0|The Apache Software License, Version + 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License + v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software + License, Version 2.0 + + The MIT License|MIT License + The 3-Clause BSD License|New BSD License|3-Clause BSD + License|BSD|3-Clause BSD License|The New BSD License + + + + + + + + + + + + arrch64 + + osx-x86_64 + + + + + checkstyle + + [1.8,) + + + + + com.mycila + license-maven-plugin + + + generate-sources + + remove + format + + + + + true +
${user.dir}/style/copyright
+ + **/src/main/java/** + **/src/test/java/** + **/*.xml + **/*.sql + **/*.conf + **/*.yml + **/*.yaml + **/*.sh + **/*.bat + **/*.lua + **/*.properties + **/*.txt + **/*.def + + + **/generated/** + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + true + + SLASHSTAR_STYLE + DOUBLEBAR_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + validate + validate + + ${user.dir}/style/seata_checkstyle.xml + ${user.dir}/style/seata_suppressions.xml + + UTF-8 + true + true + + + checkstyle + + + + + + + + + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + **/*.java.template + + + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + ${project.build.sourceEncoding} + 2 + true + + rulesets/java/ali-comment.xml + rulesets/java/ali-concurrent.xml + rulesets/java/ali-constant.xml + rulesets/java/ali-exception.xml + rulesets/java/ali-flowcontrol.xml + rulesets/java/ali-naming.xml + rulesets/java/ali-oop.xml + rulesets/java/ali-orm.xml + rulesets/java/ali-other.xml + rulesets/java/ali-set.xml + + + **/generated/*.java + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + + + + pmd-check + validate + + check + + + + + + com.alibaba.p3c + p3c-pmd + ${p3c-pmd.version} + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + test + + report + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + ${maven.surefire.argLine} + ${maven.surefire.excludes} + + + + diff --git a/discovery/pom.xml b/discovery/pom.xml index 46f9ba9c346..674402655d5 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../pom.xml + ../dependencies/pom.xml 4.0.0 pom diff --git a/pom.xml b/pom.xml index c0c7b55a27c..dddad5127d7 100644 --- a/pom.xml +++ b/pom.xml @@ -20,22 +20,17 @@ - - org.apache.seata - seata-build - ${revision} - ./build/pom.xml - 4.0.0 + org.apache.seata seata-parent pom + ${revision} Seata Parent POM ${project.version} - parent for Seata built with Maven + parent and plugin management for Seata built with Maven - build all bom common @@ -72,296 +67,424 @@ + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + Apache + https://github.com/apache + + + https://seata.apache.org + + + + Seata + Seata + https://seata.apache.org + dev@seata.apache.org + + + + + github + https://github.com/apache/incubator-seata/issues + + + + git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + scm:git@github.com:apache/incubator-seata.git + + - - 2.5.15 - + + 2.1.0-SNAPSHOT + + + 1.8 + ${java.version} + ${java.version} + UTF-8 + UTF-8 - - - - - ${project.groupId} - seata-dependencies - ${project.version} - pom - import - + + + 1.1.5 + 3.1.0 + + 3.8.1 + 0.6.1 + 1.9.21 + + 3.8 + 1.3.6 + 3.0.0 + 4.0 + 1.20 + 3.1.1 + 3.0.0-M3 + + 3.0.0-M5 + 0.8.7 + + 2.2.1 + 3.2.0 + 3.2.2 + 2.4.3 + 3.0.2 + 3.0.0 + 3.2.0 + 4.9.10 + 1.15.0 + + 2.8.2 + 1.6.7 + 1.6 + + 1.8 + 1.5.0.Final - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - + + true + true + true + false + false + + + 37F181C60AACE24BD5C1D3925583F79497E8E293 + + - - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.platform - junit-platform-launcher - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - org.mockito - mockito-inline - test - - - org.assertj - assertj-core - test - - - org.slf4j - slf4j-simple - test - - + + true + ${IMAGE_NAME} + latest + + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + + true + + + + com.mycila + license-maven-plugin + ${license-maven-plugin.version} + + + org.codehaus.mojo + license-maven-plugin + ${mojo-license-maven-plugin.version} + + + icu.easyj.maven.plugins + easyj-maven-plugin + ${easyj-maven-plugin.version} + + + + simplify-pom + + simplify-pom + + + + + .flattened-pom.xml + true + + + + pl.project13.maven + git-commit-id-plugin + ${git-commit-id-plugin.version} + + + get-the-git-infos + + revision + + + + + ${maven.git-commit-id.skip} + true + yyyy-MM-dd'T'HH:mm:ssZ + true + ${project.build.outputDirectory}/seata-git.properties + + git.commit.message.full + git.remote.origin.url + git.branch + ^git.build.(time|version)$ + ^git.commit.(id|time)$ + git.dirty + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + ${project.build.sourceEncoding} + true + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + true + true + + true + true + + + ${maven.build.timestamp} + + + + **/META-INF/additional-spring-configuration-metadata.json + protobuf/** + **/*.proto + static/console-fe/** + + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + + ./ + + *-pom.xml + **/db_store/** + **/sessionStore/** + **/root.data + + false + + + + + + + icu.easyj.maven.plugins + easyj-maven-plugin + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-maven + + enforce + + + + + [3.6.0,) + + + + + + + + + pl.project13.maven + git-commit-id-plugin + + + - + - licenseCheck + release + - org.codehaus.mojo - license-maven-plugin + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + ${project.build.sourceEncoding} + false + - license-check - generate-sources + package - add-third-party + jar - - false - false - false - - Apache License, Version 2.0|The Apache Software License, Version - 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0 - - The MIT License|MIT License - The 3-Clause BSD License|New BSD License|3-Clause BSD - License|BSD|3-Clause BSD License|The New BSD License - - - - - - - - - arrch64 - - osx-x86_64 - - - - - checkstyle - - [1.8,) - - - + - com.mycila - license-maven-plugin - - - generate-sources - - remove - format - - - + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true - true -
${user.dir}/style/copyright
- - **/src/main/java/** - **/src/test/java/** - **/*.xml - **/*.sql - **/*.conf - **/*.yml - **/*.yaml - **/*.sh - **/*.bat - **/*.lua - **/*.properties - **/*.txt - **/*.def - - - **/generated/** - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - true - - SLASHSTAR_STYLE - DOUBLEBAR_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - + oss_seata + https://oss.sonatype.org/ + false + org.apache.maven.plugins - maven-checkstyle-plugin + maven-gpg-plugin + ${maven-gpg-plugin.version} - validate - validate - - ${user.dir}/style/seata_checkstyle.xml - ${user.dir}/style/seata_suppressions.xml - UTF-8 - true - true - + sign-artifacts + verify - checkstyle + sign + + ${gpg.keyname} + + ${gpg.arg1} + ${gpg.arg2} + + + + + + oss_seata + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss_seata + https://oss.sonatype.org/content/repositories/snapshots + + - - - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - **/*.java.template - - - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - ${project.build.sourceEncoding} - 2 - true - - rulesets/java/ali-comment.xml - rulesets/java/ali-concurrent.xml - rulesets/java/ali-constant.xml - rulesets/java/ali-exception.xml - rulesets/java/ali-flowcontrol.xml - rulesets/java/ali-naming.xml - rulesets/java/ali-oop.xml - rulesets/java/ali-orm.xml - rulesets/java/ali-other.xml - rulesets/java/ali-set.xml - - - **/generated/*.java - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - - - - pmd-check - validate - - check - - - - - - com.alibaba.p3c - p3c-pmd - ${p3c-pmd.version} - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${maven.surefire.argLine} - ${maven.surefire.excludes} - - - - + + + release-by-github-actions + + --pinentry-mode + loopback + + + + + + args-for-test-by-jdk17-and-above + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED + --add-opens java.base/java.math=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.regex=ALL-UNNAMED + --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + --add-opens java.sql/java.sql=ALL-UNNAMED + --add-opens java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED + + -Dnet.bytebuddy.experimental=true + + + + + + + args-for-client-test + + org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java + + + diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml index 0703d7a55c7..2b8c30a74d3 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../../pom.xml + ../../dependencies/pom.xml 4.0.0 diff --git a/serializer/pom.xml b/serializer/pom.xml index 01171e09aa4..6a77926e99d 100644 --- a/serializer/pom.xml +++ b/serializer/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies ${revision} - ../pom.xml + ../dependencies/pom.xml 4.0.0 seata-serializer From 0ce3e31e356704ced5a31e5c500406751af26e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 02:10:23 +0800 Subject: [PATCH 14/52] =?UTF-8?q?netty=E4=BE=9D=E8=B5=96=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A6=86=E7=9B=96spring-boot-depend?= =?UTF-8?q?encies=E7=9A=84=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index cd6bce6919e..90c48fd4790 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -154,8 +154,10 @@ io.netty - netty-all + netty-bom ${netty.version} + pom + import From a348756236986ebc570f765de45d2dadbe72c618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 10:30:13 +0800 Subject: [PATCH 15/52] =?UTF-8?q?byte-buddy=E4=BE=9D=E8=B5=96=EF=BC=8C?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=9B=9Edependencies=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-client/pom.xml | 8 -------- dependencies/pom.xml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index b599ab1b7bf..2ddf18e7912 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -39,7 +39,6 @@ 4.8 1.5.9 - 1.12.17 2.5.9 @@ -85,13 +84,6 @@ ${protostuff.version} - - - net.bytebuddy - byte-buddy - ${bytebuddy.version} - - diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 90c48fd4790..159558f012f 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -53,6 +53,8 @@ 0.11 3.7.2 + + 1.12.17 1.10.12 @@ -211,6 +213,18 @@ + + + net.bytebuddy + byte-buddy + ${bytebuddy.version} + + + net.bytebuddy + byte-buddy-agent + ${bytebuddy.version} + + com.alibaba From bca927aa609929521585bb02dd0ee31e60e0773d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 11:21:18 +0800 Subject: [PATCH 16/52] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 5 +++++ compatible/pom.xml | 9 ++++++--- dependencies-server/pom.xml | 13 +++++++++---- dependencies/pom.xml | 26 ++++++++++++++------------ 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index bcec284076a..e19bdd1edbc 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -443,6 +443,11 @@ registry-client-all provided + + com.alipay.sofa + hessian + provided + com.alibaba.nacos nacos-client diff --git a/compatible/pom.xml b/compatible/pom.xml index 6f4bb7bf8c1..c552ec4d279 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -28,8 +28,11 @@ seata-all ${project.version} compatible with io.seata API - 8 - 8 + 1.8 + ${java.version} + ${java.version} + UTF-8 + UTF-8 @@ -111,7 +114,7 @@ junit-jupiter-api 5.8.2 test - + org.apache.seata seata-tcc diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 0a10804ebd4..9e7c235ebb1 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -58,8 +58,8 @@ 1.82 - - 3.1.7 + + 3.1.9 @@ -119,11 +119,16 @@ ${jcommander.version} - + org.codehaus.janino janino - ${janino-version} + ${janino.version} + + + org.codehaus.janino + commons-compiler + ${janino.version} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 159558f012f..9fa8e7afc47 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -109,11 +109,9 @@ 4.11.0 - 3.12.2 + 3.12.2 5.8.2 - 1.8.2 - 9.4.38.v20210224 - 3.1.7 + 9.4.38.v20210224 2.4.0 @@ -462,13 +460,10 @@ org.eclipse.jetty - jetty-security - ${jetty-version} - - - org.eclipse.jetty - jetty-servlet - ${jetty-version} + jetty-bom + ${jetty.version} + pom + import org.apache.httpcomponents @@ -511,11 +506,18 @@ mockito-inline ${mockito.version} + + org.mockito + mockito-bom + ${mockito.version} + pom + import + org.assertj assertj-core - ${assertj-core.version} + ${assertj.version} From 0cf7948ede7a0ac5cd2bf1d062d372a375775fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 11:22:34 +0800 Subject: [PATCH 17/52] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-server/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 9e7c235ebb1..8adca740a9e 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -130,6 +130,11 @@ commons-compiler ${janino.version} + + org.codehaus.janino + commons-compiler-jdk + ${janino.version} + From 0252f3e3337248632cc4883e46d88317baa0bcf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 15:53:43 +0800 Subject: [PATCH 18/52] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 9 +++++++ compatible/pom.xml | 5 ++++ .../io/seata/metrics/exporter/Exporter.java | 25 +++++++++++++++++++ .../io/seata/metrics/registry/Registry.java | 25 +++++++++++++++++++ console/pom.xml | 8 ++++++ .../core/protocol/MessageFutureTest.java | 2 +- dependencies-client/pom.xml | 1 + ext/apm-seata-skywalking-plugin/pom.xml | 6 +---- .../DefaultCoreDoGlobalCommitInterceptor.java | 4 +-- ...ettyRemotingClientSendSyncInterceptor.java | 4 +-- .../RemotingProcessorProcessInterceptor.java | 4 +-- test/pom.xml | 4 ++- 12 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 compatible/src/main/java/io/seata/metrics/exporter/Exporter.java create mode 100644 compatible/src/main/java/io/seata/metrics/registry/Registry.java diff --git a/all/pom.xml b/all/pom.xml index e19bdd1edbc..714a0205a71 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -428,6 +428,10 @@ edas-sdk provided + + aopalliance + aopalliance + com.101tec zkclient @@ -448,6 +452,11 @@ hessian provided + + com.alibaba.spring + spring-context-support + provided + com.alibaba.nacos nacos-client diff --git a/compatible/pom.xml b/compatible/pom.xml index c552ec4d279..b4e49933736 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -55,6 +55,11 @@ seata-integration-tx-api ${project.version} + + org.apache.seata + seata-metrics-api + ${project.version} + org.apache.seata seata-sqlparser-druid diff --git a/compatible/src/main/java/io/seata/metrics/exporter/Exporter.java b/compatible/src/main/java/io/seata/metrics/exporter/Exporter.java new file mode 100644 index 00000000000..612b8484423 --- /dev/null +++ b/compatible/src/main/java/io/seata/metrics/exporter/Exporter.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.seata.metrics.exporter; + + +/** + * Exporter interface for metrics + * + */ +public interface Exporter extends org.apache.seata.metrics.exporter.Exporter { +} diff --git a/compatible/src/main/java/io/seata/metrics/registry/Registry.java b/compatible/src/main/java/io/seata/metrics/registry/Registry.java new file mode 100644 index 00000000000..7bb8b78f796 --- /dev/null +++ b/compatible/src/main/java/io/seata/metrics/registry/Registry.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.seata.metrics.registry; + + +/** + * Registry interface for metrics + * + */ +public interface Registry extends org.apache.seata.metrics.registry.Registry { +} diff --git a/console/pom.xml b/console/pom.xml index b2690129b0f..2fa7c7749b9 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -27,8 +27,10 @@ ../dependencies-server/pom.xml 4.0.0 + seata-console jar + seata-console ${project.version} console for Seata built with Maven @@ -55,6 +57,10 @@ javax.servlet javax.servlet-api + io.jsonwebtoken jjwt-api @@ -70,6 +76,7 @@ runtime + release-frontend @@ -142,6 +149,7 @@ + diff --git a/core/src/test/java/org/apache/seata/core/protocol/MessageFutureTest.java b/core/src/test/java/org/apache/seata/core/protocol/MessageFutureTest.java index 380b1bf96fa..d48b0e43c1e 100644 --- a/core/src/test/java/org/apache/seata/core/protocol/MessageFutureTest.java +++ b/core/src/test/java/org/apache/seata/core/protocol/MessageFutureTest.java @@ -41,7 +41,7 @@ public class MessageFutureTest { private static final byte COMPRESS_FIELD = 2; private static final byte MSG_TYPE_FIELD = 3; private static final HashMap HEAD_FIELD = new HashMap<>(); - private static final long TIME_OUT_FIELD = 100L; + private static final long TIME_OUT_FIELD = 500L; /** * Test field set get. diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index 2ddf18e7912..9ca2660863c 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -257,4 +257,5 @@ + diff --git a/ext/apm-seata-skywalking-plugin/pom.xml b/ext/apm-seata-skywalking-plugin/pom.xml index a1775ec7f9e..3ba08210fae 100644 --- a/ext/apm-seata-skywalking-plugin/pom.xml +++ b/ext/apm-seata-skywalking-plugin/pom.xml @@ -33,25 +33,21 @@ skywalking plugin for Seata built with Maven - 8.6.0 - true ${project.build.directory}/ext/skywalking-agent/ ${agent.dir}/plugins/ ${agent.dir}/config - org.apache.skywalking apm-agent-core - ${skywalking.version} provided org.apache.seata - seata-all + seata-core ${project.version} provided diff --git a/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/DefaultCoreDoGlobalCommitInterceptor.java b/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/DefaultCoreDoGlobalCommitInterceptor.java index 64c171a5007..f6417242f38 100644 --- a/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/DefaultCoreDoGlobalCommitInterceptor.java +++ b/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/DefaultCoreDoGlobalCommitInterceptor.java @@ -16,8 +16,8 @@ */ package org.apache.seata.apm.skywalking.plugin; -import com.alipay.sofa.common.profile.StringUtil; import org.apache.seata.apm.skywalking.plugin.common.SWSeataUtils; +import org.apache.seata.common.util.StringUtils; import org.apache.seata.core.protocol.AbstractMessage; import org.apache.seata.core.protocol.RpcMessage; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -45,7 +45,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr activeSpan.setComponent(ComponentsDefine.SEATA); String xid = SWSeataUtils.convertXid(rpcMessage); - if (StringUtil.isNotBlank(xid)) { + if (StringUtils.isNotBlank(xid)) { activeSpan.tag(new StringTag(20, "Seata.xid"), xid); } } diff --git a/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/NettyRemotingClientSendSyncInterceptor.java b/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/NettyRemotingClientSendSyncInterceptor.java index 1ed7c99c2e2..e953bbdf126 100644 --- a/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/NettyRemotingClientSendSyncInterceptor.java +++ b/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/NettyRemotingClientSendSyncInterceptor.java @@ -16,9 +16,9 @@ */ package org.apache.seata.apm.skywalking.plugin; -import com.alipay.sofa.common.profile.StringUtil; import io.netty.channel.Channel; import org.apache.seata.apm.skywalking.plugin.common.SWSeataUtils; +import org.apache.seata.common.util.StringUtils; import org.apache.seata.core.protocol.AbstractMessage; import org.apache.seata.core.protocol.RpcMessage; import org.apache.skywalking.apm.agent.core.context.CarrierItem; @@ -59,7 +59,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } String xid = SWSeataUtils.convertXid(rpcMessage); - if (StringUtil.isNotBlank(xid)) { + if (StringUtils.isNotBlank(xid)) { activeSpan.tag(new StringTag(20, "Seata.xid"), xid); } } diff --git a/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/RemotingProcessorProcessInterceptor.java b/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/RemotingProcessorProcessInterceptor.java index c131feae468..37a25cc7af5 100644 --- a/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/RemotingProcessorProcessInterceptor.java +++ b/ext/apm-seata-skywalking-plugin/src/main/java/org/apache/seata/apm/skywalking/plugin/RemotingProcessorProcessInterceptor.java @@ -16,8 +16,8 @@ */ package org.apache.seata.apm.skywalking.plugin; -import com.alipay.sofa.common.profile.StringUtil; import org.apache.seata.apm.skywalking.plugin.common.SWSeataUtils; +import org.apache.seata.common.util.StringUtils; import org.apache.seata.core.protocol.AbstractMessage; import org.apache.seata.core.protocol.RpcMessage; import org.apache.skywalking.apm.agent.core.context.CarrierItem; @@ -57,7 +57,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, activeSpan.setComponent(ComponentsDefine.SEATA); String xid = SWSeataUtils.convertXid(rpcMessage); - if (StringUtil.isNotBlank(xid)) { + if (StringUtils.isNotBlank(xid)) { activeSpan.tag(new StringTag(20, "Seata.xid"), xid); } } diff --git a/test/pom.xml b/test/pom.xml index aa325257b0d..e8d571f5520 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -67,6 +67,7 @@ ${project.version} + ${project.groupId} @@ -74,7 +75,7 @@ ${project.version} - org.apache.seata + ${project.groupId} seata-spring-autoconfigure-server @@ -85,6 +86,7 @@ ${project.version} + com.h2database h2 From 588be1c0b17956539bec7058ef31b1400db583b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 16:15:03 +0800 Subject: [PATCH 19/52] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 9 ------ dependencies-client/pom.xml | 15 ++++++++++ dependencies-server/pom.xml | 30 ++++++++++++++++++- dependencies/pom.xml | 15 ---------- rm/pom.xml | 1 - .../seata-spring-autoconfigure-client/pom.xml | 2 +- server/pom.xml | 4 ++- test-mock-server/pom.xml | 4 ++- 8 files changed, 51 insertions(+), 29 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 714a0205a71..e19bdd1edbc 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -428,10 +428,6 @@ edas-sdk provided - - aopalliance - aopalliance - com.101tec zkclient @@ -452,11 +448,6 @@ hessian provided - - com.alibaba.spring - spring-context-support - provided - com.alibaba.nacos nacos-client diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index 9ca2660863c..697bdaeac61 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -61,6 +61,9 @@ 5.0.0 + + + 1.3.14 @@ -255,6 +258,18 @@ rocketmq-client ${rocketmq-version} + + + + ch.qos.logback + logback-classic + ${logback.version} + + + ch.qos.logback + logback-core + ${logback.version} + diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 8adca740a9e..49382651b5d 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -36,7 +36,7 @@ - 2.7.18 + 2.7.18 ${mysql.version} @@ -50,6 +50,8 @@ 0.6.0 + + 8.6.0 6.5 @@ -88,12 +90,20 @@ ${jjwt.version} + io.prometheus simpleclient_httpserver ${prometheus.client.version} + + + org.apache.skywalking + apm-agent-core + ${skywalking.version} + + @@ -135,6 +145,24 @@ commons-compiler-jdk ${janino.version} + + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot-for-server.version} + pom + import + diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 9fa8e7afc47..ad803f0fffa 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -104,9 +104,6 @@ 2.9.0 3.4.3 - - 1.3.14 - 4.11.0 3.12.2 @@ -477,18 +474,6 @@ - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - - diff --git a/rm/pom.xml b/rm/pom.xml index 62d320b63ad..e4946f07e9c 100644 --- a/rm/pom.xml +++ b/rm/pom.xml @@ -44,5 +44,4 @@ - diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml index e35cc30671a..e947bb559a2 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml @@ -39,7 +39,7 @@ ${project.version} - + ${project.groupId} seata-all diff --git a/server/pom.xml b/server/pom.xml index 0d82b54c882..530923e93fc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -27,8 +27,10 @@ ../dependencies-server/pom.xml 4.0.0 + seata-server jar + seata-server ${project.version} server for Seata built with Maven @@ -356,7 +358,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version} + ${spring-boot-for-server.version} org.apache.seata.server.ServerApplication ZIP diff --git a/test-mock-server/pom.xml b/test-mock-server/pom.xml index d8b4cb36b35..29edcaaa77a 100644 --- a/test-mock-server/pom.xml +++ b/test-mock-server/pom.xml @@ -27,8 +27,10 @@ ../dependencies-server/pom.xml 4.0.0 + seata-mock-server jar + seata-mock-server ${project.version} Seata mock server @@ -38,7 +40,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version} + ${spring-boot-for-server.version} org.apache.seata.mockserver.MockServer From 760d860788e695ca4b205718f7bb7ea651372b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 17:37:40 +0800 Subject: [PATCH 20/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-druid.yml | 2 +- .github/workflows/test.yml | 4 +-- .../saga/engine/db/AbstractServerTest.java | 26 ++++++++++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml index f004c41db81..988bea57eb5 100644 --- a/.github/workflows/test-druid.yml +++ b/.github/workflows/test-druid.yml @@ -2,7 +2,7 @@ name: "test-druid" on: push: - branches: [ test*, "*.*.*" ] + branches: [ "*.*.*" ] jobs: test-druid: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7a6dcaeedb..8bc3d2fb295 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,9 +14,7 @@ jobs: matrix: java: [ 8, 11, 17, 21 ] os: [ - ubuntu, - macos, - windows, # Skip tests, because too many errors in unit-test. + macos ] springboot: [ 2.7.18, diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java index bb26a62dca6..a42760c42d8 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java @@ -30,6 +30,8 @@ import org.apache.seata.server.coordinator.DefaultCoordinator; import org.apache.seata.server.metrics.MetricsManager; import org.apache.seata.server.session.SessionHolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract Server Test @@ -37,16 +39,19 @@ */ public abstract class AbstractServerTest { + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractServerTest.class); private static NettyRemotingServer nettyServer; private static final ThreadPoolExecutor workingThreads = new ThreadPoolExecutor(100, 500, 500, TimeUnit.SECONDS, new LinkedBlockingQueue(20000), new ThreadPoolExecutor.CallerRunsPolicy()); protected static void startSeataServer() throws InterruptedException { - (new Thread(new Runnable() { - public void run() { + (new Thread(() -> { + LOGGER.info("Starting Seata Server..."); + + try { File file = new File("sessionStore/root.data"); - if(file.exists()){ + if (file.exists()) { file.delete(); } @@ -75,15 +80,24 @@ public void run() { XID.setPort(nettyServer.getListenPort()); nettyServer.init(); + + LOGGER.info("Seata Server started"); + } catch (Exception e) { + LOGGER.error("Start Seata Server error: {}", e.getMessage(), e); } })).start(); Thread.sleep(5000); } protected static final void stopSeataServer() throws InterruptedException { - if(nettyServer != null){ - nettyServer.destroy(); - Thread.sleep(5000); + if (nettyServer != null) { + LOGGER.info("Stopping Seata Server..."); + + nettyServer.destroy(); + + LOGGER.info("Seata Server stopped"); + + Thread.sleep(5000); } } From 48b4554ed4fc537864060ae7e0f18e88f9886ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 17:44:22 +0800 Subject: [PATCH 21/52] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seata/saga/engine/db/AbstractServerTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java index a42760c42d8..cb35cb5cbe6 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java @@ -89,13 +89,16 @@ protected static void startSeataServer() throws InterruptedException { Thread.sleep(5000); } - protected static final void stopSeataServer() throws InterruptedException { + protected static void stopSeataServer() throws InterruptedException { if (nettyServer != null) { LOGGER.info("Stopping Seata Server..."); - nettyServer.destroy(); - - LOGGER.info("Seata Server stopped"); + try { + nettyServer.destroy(); + LOGGER.info("Seata Server stopped"); + } catch (Exception e) { + LOGGER.error("Stop Seata Server error: {}", e.getMessage(), e); + } Thread.sleep(5000); } From 8f97715b71c949fd1db1d77f48741a5782ab1cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 18:01:25 +0800 Subject: [PATCH 22/52] =?UTF-8?q?AbstractServerTest=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saga/engine/db/AbstractServerTest.java | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java index cb35cb5cbe6..14123d0dd43 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java @@ -17,9 +17,11 @@ package org.apache.seata.saga.engine.db; import java.io.File; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.seata.common.XID; import org.apache.seata.common.util.NetUtil; @@ -46,12 +48,16 @@ public abstract class AbstractServerTest { new LinkedBlockingQueue(20000), new ThreadPoolExecutor.CallerRunsPolicy()); protected static void startSeataServer() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(1); + AtomicBoolean started = new AtomicBoolean(false); + + // start seata-server (new Thread(() -> { LOGGER.info("Starting Seata Server..."); try { File file = new File("sessionStore/root.data"); - if (file.exists()) { + if(file.exists()){ file.delete(); } @@ -81,17 +87,34 @@ protected static void startSeataServer() throws InterruptedException { nettyServer.init(); + started.set(true); LOGGER.info("Seata Server started"); } catch (Exception e) { LOGGER.error("Start Seata Server error: {}", e.getMessage(), e); + } finally { + latch.countDown(); } })).start(); - Thread.sleep(5000); + + // wait until seata-server started + try { + LOGGER.info("Waiting for Seata Server to start..."); + + latch.await(); + + if (started.get()) { + LOGGER.info("Seata Server started successfully"); + } else { + LOGGER.error("Seata Server failed to start"); + } + } catch (Exception e) { + LOGGER.error("Wait seata-server start, but failed: {}", e.getMessage(), e); + } } protected static void stopSeataServer() throws InterruptedException { - if (nettyServer != null) { - LOGGER.info("Stopping Seata Server..."); + if(nettyServer != null){ + LOGGER.info("Stopping Seata Server..."); try { nettyServer.destroy(); @@ -100,7 +123,7 @@ protected static void stopSeataServer() throws InterruptedException { LOGGER.error("Stop Seata Server error: {}", e.getMessage(), e); } - Thread.sleep(5000); + Thread.sleep(5000); } } From 1b2daea2b8e5b65e3c4b2902fcf5cc819f275e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 20:27:04 +0800 Subject: [PATCH 23/52] =?UTF-8?q?NettyServerBootstrap=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seata/core/rpc/netty/NettyServerBootstrap.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java index 493992b1f44..ba7e1f16344 100644 --- a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java +++ b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java @@ -111,6 +111,8 @@ public void setListenPort(int listenPort) { if (listenPort <= 0) { throw new IllegalArgumentException("listen port: " + listenPort + " is invalid!"); } + + LOGGER.info("set listen port: {}", listenPort); this.listenPort = listenPort; } @@ -121,12 +123,14 @@ public void setListenPort(int listenPort) { */ public int getListenPort() { if (listenPort != 0) { + LOGGER.info("get current listen port: {}", listenPort); return listenPort; } String strPort = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL); int port = 0; try { port = Integer.parseInt(strPort); + LOGGER.info("get listen port from configuration: {}", port); } catch (NumberFormatException exx) { LOGGER.error("server service port set error:{}", exx.getMessage()); } @@ -168,14 +172,14 @@ public void initChannel(SocketChannel ch) { try { this.serverBootstrap.bind(port).sync(); - LOGGER.info("Server started, service listen port: {}", getListenPort()); + LOGGER.info("Server started, service listen port: {}", port); InetSocketAddress address = new InetSocketAddress(XID.getIpAddress(), XID.getPort()); for (RegistryService registryService : MultiRegistryFactory.getInstances()) { registryService.register(address); } initialized.set(true); } catch (SocketException se) { - throw new RuntimeException("Server start failed, the listen port: " + getListenPort(), se); + throw new RuntimeException("Server start failed, the listen port: " + port, se); } catch (Exception exx) { throw new RuntimeException("Server start failed", exx); } @@ -189,7 +193,7 @@ public void shutdown() { } if (initialized.get()) { InetSocketAddress address = new InetSocketAddress(XID.getIpAddress(), XID.getPort()); - for (RegistryService registryService : MultiRegistryFactory.getInstances()) { + for (RegistryService registryService : MultiRegistryFactory.getInstances()) { registryService.unregister(address); registryService.close(); } From 0a0ca3f79b6d9e8aa86ab42e6730c6320dbe1e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 20:32:47 +0800 Subject: [PATCH 24/52] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8F=AA=E6=B5=8Bmacos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8bc3d2fb295..84e2dff315d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,9 +63,7 @@ jobs: matrix: java: [ 17, 21 ] os: [ - ubuntu, - macos, - windows, # Skip tests, because too many errors in unit-test. + macos ] springboot: [ 3.2.0, From 62e2948085efc3084527e598350eab2df0ec0e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 20:48:10 +0800 Subject: [PATCH 25/52] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/seata/config/AbstractConfiguration.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java b/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java index 5e6fc1601cd..5b36d7c8c9e 100644 --- a/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java +++ b/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java @@ -20,6 +20,8 @@ import org.apache.seata.common.util.DurationUtil; import org.apache.seata.common.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The type Abstract configuration. @@ -27,6 +29,8 @@ */ public abstract class AbstractConfiguration implements Configuration { + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConfiguration.class); + /** * The constant DEFAULT_CONFIG_TIMEOUT. */ @@ -136,9 +140,13 @@ public String getConfig(String dataId, long timeoutMills) { public String getConfig(String dataId, String content, long timeoutMills) { String value = getConfigFromSys(dataId); if (value != null) { + LOGGER.info("Get config from system property, {}={}, type={}", dataId, value, getTypeName()); return value; } - return getLatestConfig(dataId, content, timeoutMills); + + value = getLatestConfig(dataId, content, timeoutMills); + LOGGER.info("Get config {}={}, type={}", dataId, value, getTypeName()); + return value; } @Override From 818c985537ea19944a044f7000f0abb42c696d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 21:43:32 +0800 Subject: [PATCH 26/52] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 40 ------------------- .../seata/config/ConfigurationFactory.java | 2 +- .../seata/common/ConfigurationTestHelper.java | 20 +++++----- 3 files changed, 12 insertions(+), 50 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84e2dff315d..3b936e3bce9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -97,43 +97,3 @@ jobs: run: | # Skip tests, because too many errors in unit-test. ./mvnw.cmd -version; ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; - - # job 3 - test-arm64: - name: "test-arm64" - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - springboot: [ - #2.7.18, # The maven-compiler-plugin will throw an error for an unknown reason. - #2.6.15, # The maven-compiler-plugin will throw an error for an unknown reason. - #2.5.15, # The maven-compiler-plugin will throw an error for an unknown reason. - 2.4.13, - 2.3.12.RELEASE, - 2.2.13.RELEASE, - #2.1.18.RELEASE, - #2.0.9.RELEASE - ] - steps: - # step 1 - - name: "Checkout" - uses: actions/checkout@v3 - # step 2 - - name: "Set up QEMU" - id: qemu - uses: docker/setup-qemu-action@v3 - # step 3 - - name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)" - run: | - docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \ - arm64v8/ubuntu:20.04 \ - bash -exc 'apt-get update -y && \ - apt-get install maven -y && \ - mvn -version && \ - mvn -T 4C clean install \ - -Dspring-boot.version=${{ matrix.springboot }} \ - -Prelease-seata \ - -DskipTests \ - -Dmaven.git-commit-id.skip=true \ - -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationFactory.java b/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationFactory.java index c86454e7a4e..d8f18529553 100644 --- a/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationFactory.java +++ b/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationFactory.java @@ -139,7 +139,6 @@ public static Optional getOriginFileInstance() { } private static Configuration buildConfiguration() { - ConfigType configType = getConfigType(); Configuration extConfiguration = null; Configuration configuration = ORIGIN_FILE_INSTANCE; if (configuration != null) { @@ -155,6 +154,7 @@ private static Configuration buildConfiguration() { LOGGER.error("failed to load extConfiguration:{}", e.getMessage(), e); } } else { + ConfigType configType = getConfigType(); configuration = EnhancedServiceLoader .load(ConfigurationProvider.class, Objects.requireNonNull(configType).name()).provide(); } diff --git a/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java b/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java index 308d7211f3b..77a7c647ef6 100644 --- a/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java +++ b/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java @@ -33,27 +33,29 @@ public class ConfigurationTestHelper { private static final long PUT_CONFIG_TIMEOUT = 60000L; public static void removeConfig(String dataId) { - putConfig(dataId, null); + //ConfigurationCache.removeConfigListener(dataId); + String content = System.clearProperty(dataId); + ConfigurationFactory.getInstance().removeConfig(dataId); + LOGGER.info("removeConfig, dataId={}, content={}", dataId, content); } public static void putConfig(String dataId, String content) { - CountDownLatch countDownLatch = new CountDownLatch(1); - ConfigurationCache.addConfigListener(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, event -> countDownLatch.countDown()); if (content == null) { - System.clearProperty(dataId); - ConfigurationFactory.getInstance().removeConfig(dataId); + removeConfig(dataId); return; } + CountDownLatch countDownLatch = new CountDownLatch(1); + ConfigurationCache.addConfigListener(dataId, event -> countDownLatch.countDown()); System.setProperty(dataId, content); ConfigurationFactory.getInstance().putConfig(dataId, content); try { boolean await = countDownLatch.await(PUT_CONFIG_TIMEOUT, TimeUnit.MILLISECONDS); - if(await){ - LOGGER.info("putConfig ok, dataId={}", dataId); - }else { - LOGGER.error("putConfig fail, dataId={}", dataId); + if (await) { + LOGGER.info("putConfig ok, dataId={}, content={}", dataId, content); + } else { + LOGGER.error("putConfig fail, dataId={}, content={}", dataId, content); } } catch (InterruptedException e) { throw new RuntimeException(e); From 85f256cd76521a050dd85f85bf62595177c38f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 7 Mar 2024 21:50:52 +0800 Subject: [PATCH 27/52] =?UTF-8?q?=E4=BC=98=E5=8C=96=20NettyServerBootstrap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seata/core/rpc/netty/NettyServerBootstrap.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java index ba7e1f16344..01e28197aae 100644 --- a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java +++ b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java @@ -144,7 +144,7 @@ public int getListenPort() { @Override public void start() { - int port = getListenPort(); + int port = XID.getPort(); this.serverBootstrap.group(this.eventLoopGroupBoss, this.eventLoopGroupWorker) .channel(NettyServerConfig.SERVER_CHANNEL_CLAZZ) .option(ChannelOption.SO_BACKLOG, nettyServerConfig.getSoBackLogSize()) @@ -173,7 +173,7 @@ public void initChannel(SocketChannel ch) { try { this.serverBootstrap.bind(port).sync(); LOGGER.info("Server started, service listen port: {}", port); - InetSocketAddress address = new InetSocketAddress(XID.getIpAddress(), XID.getPort()); + InetSocketAddress address = new InetSocketAddress(XID.getIpAddress(), port); for (RegistryService registryService : MultiRegistryFactory.getInstances()) { registryService.register(address); } @@ -188,11 +188,12 @@ public void initChannel(SocketChannel ch) { @Override public void shutdown() { try { + int port = XID.getPort(); if (LOGGER.isInfoEnabled()) { - LOGGER.info("Shutting server down, the listen port: {}", XID.getPort()); + LOGGER.info("Shutting server down, the listen port: {}", port); } if (initialized.get()) { - InetSocketAddress address = new InetSocketAddress(XID.getIpAddress(), XID.getPort()); + InetSocketAddress address = new InetSocketAddress(XID.getIpAddress(), port); for (RegistryService registryService : MultiRegistryFactory.getInstances()) { registryService.unregister(address); registryService.close(); From 9781ca346fdd87bf6cd0fa2a3597c323bad43034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 07:45:47 +0800 Subject: [PATCH 28/52] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/seata/saga/engine/db/StateMachineDBTests.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java index 0cc1fc81138..eee895e664f 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java @@ -23,6 +23,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.seata.common.ConfigurationKeys; +import org.apache.seata.common.ConfigurationTestHelper; import org.apache.seata.common.LockAndCallback; import org.apache.seata.common.SagaCostPrint; import org.apache.seata.common.exception.FrameworkErrorCode; @@ -65,7 +67,7 @@ public class StateMachineDBTests extends AbstractServerTest { @BeforeAll public static void initApplicationContext() throws InterruptedException { - + ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, "8091"); startSeataServer(); ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:saga/spring/statemachine_engine_db_test.xml"); @@ -75,6 +77,7 @@ public static void initApplicationContext() throws InterruptedException { @AfterAll public static void destory() throws InterruptedException { + ConfigurationTestHelper.removeConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL); stopSeataServer(); } From 1a5353536c2e8ec804f8e84e09605faf73f9f03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 09:36:10 +0800 Subject: [PATCH 29/52] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seata/core/rpc/netty/v1/ProtocolV1SerializerTest.java | 4 ++-- .../org/apache/seata/core/rpc/netty/v1/ProtocolV1Server.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1SerializerTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1SerializerTest.java index 31025304a12..6a22d630e4c 100644 --- a/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1SerializerTest.java +++ b/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1SerializerTest.java @@ -49,7 +49,7 @@ public void testAll() { ProtocolV1Client client = new ProtocolV1Client(); try { server.start(); - client.connect("127.0.0.1", 8811, 500); + client.connect("127.0.0.1", server.getPort(), 500); Assertions.assertTrue(client.channel.isActive()); @@ -66,7 +66,7 @@ public void testAll() { body.setXid("xid-1234"); // test run times - int runTimes = 100000; + int runTimes = 10000; final int threads = 50; final CountDownLatch cnt = new CountDownLatch(runTimes); diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Server.java b/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Server.java index 9a0d0676876..ff293de6168 100644 --- a/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Server.java +++ b/test/src/test/java/org/apache/seata/core/rpc/netty/v1/ProtocolV1Server.java @@ -115,6 +115,10 @@ private EventLoopGroup createWorkerGroup() { return new NioEventLoopGroup(10, threadName); } + public int getPort() { + return port; + } + public static void main(String[] args) { ProtocolV1Server server = new ProtocolV1Server(); server.start(); From 4726501a02f6946f9f8e3704fb29343c124c23b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 10:07:18 +0800 Subject: [PATCH 30/52] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9B=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 6 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/license-checker.yaml | 2 +- .github/workflows/publish-docker.yml | 4 +- .github/workflows/publish-ossrh.yml | 4 +- .github/workflows/test-druid.yml | 2 +- .github/workflows/test.yml | 56 +++++++++++++++++-- .../seata/config/AbstractConfiguration.java | 8 +-- .../core/rpc/netty/NettyServerBootstrap.java | 12 ++-- seata-spring-boot-starter/pom.xml | 12 ++++ server/pom.xml | 2 +- .../seata/common/ConfigurationTestHelper.java | 4 +- .../saga/engine/db/AbstractServerTest.java | 20 ++++--- .../saga/engine/db/StateMachineDBTests.java | 2 +- 14 files changed, 98 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db561ebe1a5..319b653bfd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2 - name: "Set up Java JDK" - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.1.0 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -57,7 +57,7 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2 - name: "Set up QEMU" id: qemu diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f1b048aab00..24d0a30e76d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2: Initializes the CodeQL tools for scanning. - name: "Initialize CodeQL" diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml index 87b4b29f38d..c513efb9707 100644 --- a/.github/workflows/license-checker.yaml +++ b/.github/workflows/license-checker.yaml @@ -14,7 +14,7 @@ jobs: shell: bash # step 2 checkout - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 3 https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index f5ab0427080..41b6c6d4615 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -21,10 +21,10 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2 - name: "Setup Java JDK" - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.1.0 with: distribution: 'zulu' java-version: ${{ matrix.java }} diff --git a/.github/workflows/publish-ossrh.yml b/.github/workflows/publish-ossrh.yml index 0d5a9f7e734..e2915080950 100644 --- a/.github/workflows/publish-ossrh.yml +++ b/.github/workflows/publish-ossrh.yml @@ -14,10 +14,10 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v4.1.1 # step 2 - name: "Setup Java JDK" - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.1.0 with: distribution: 'zulu' java-version: 8 diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml index 988bea57eb5..f004c41db81 100644 --- a/.github/workflows/test-druid.yml +++ b/.github/workflows/test-druid.yml @@ -2,7 +2,7 @@ name: "test-druid" on: push: - branches: [ "*.*.*" ] + branches: [ test*, "*.*.*" ] jobs: test-druid: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3b936e3bce9..573345dc7b8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,9 @@ jobs: matrix: java: [ 8, 11, 17, 21 ] os: [ - macos + ubuntu, + macos, + windows, # Skip tests, because too many errors in unit-test. ] springboot: [ 2.7.18, @@ -29,10 +31,10 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2 - name: "Set up Java JDK" - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.1.0 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -63,7 +65,9 @@ jobs: matrix: java: [ 17, 21 ] os: [ - macos + ubuntu, + macos, + windows, # Skip tests, because too many errors in unit-test. ] springboot: [ 3.2.0, @@ -73,10 +77,10 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2 - name: "Set up Java JDK" - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.1.0 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -97,3 +101,43 @@ jobs: run: | # Skip tests, because too many errors in unit-test. ./mvnw.cmd -version; ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + + # job 3 + test-arm64: + name: "test-arm64" + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + springboot: [ + #2.7.18, # The maven-compiler-plugin will throw an error for an unknown reason. + #2.6.15, # The maven-compiler-plugin will throw an error for an unknown reason. + #2.5.15, # The maven-compiler-plugin will throw an error for an unknown reason. + 2.4.13, + 2.3.12.RELEASE, + 2.2.13.RELEASE, + #2.1.18.RELEASE, + #2.0.9.RELEASE, + ] + steps: + # step 1 + - name: "Checkout" + uses: actions/checkout@v4.1.1 + # step 2 + - name: "Set up QEMU" + id: qemu + uses: docker/setup-qemu-action@v3 + # step 3 + - name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)" + run: | + docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \ + arm64v8/ubuntu:20.04 \ + bash -exc 'apt-get update -y && \ + apt-get install maven -y && \ + mvn -version && \ + mvn -T 4C clean install \ + -Dspring-boot.version=${{ matrix.springboot }} \ + -Prelease-seata \ + -DskipTests \ + -Dmaven.git-commit-id.skip=true \ + -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java b/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java index 5b36d7c8c9e..554074d6276 100644 --- a/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java +++ b/config/seata-config-core/src/main/java/org/apache/seata/config/AbstractConfiguration.java @@ -138,14 +138,14 @@ public String getConfig(String dataId, long timeoutMills) { @Override public String getConfig(String dataId, String content, long timeoutMills) { - String value = getConfigFromSys(dataId); + String value = this.getConfigFromSys(dataId); if (value != null) { - LOGGER.info("Get config from system property, {}={}, type={}", dataId, value, getTypeName()); + LOGGER.debug("Get config from system property, {}={}, configType={}", dataId, value, getTypeName()); return value; } - value = getLatestConfig(dataId, content, timeoutMills); - LOGGER.info("Get config {}={}, type={}", dataId, value, getTypeName()); + value = this.getLatestConfig(dataId, content, timeoutMills); + LOGGER.debug("Get config {}={}, configType={}", dataId, value, getTypeName()); return value; } diff --git a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java index 01e28197aae..a03e28422bc 100644 --- a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java +++ b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java @@ -112,7 +112,7 @@ public void setListenPort(int listenPort) { throw new IllegalArgumentException("listen port: " + listenPort + " is invalid!"); } - LOGGER.info("set listen port: {}", listenPort); + LOGGER.debug("set listen port: {}", listenPort); this.listenPort = listenPort; } @@ -123,16 +123,18 @@ public void setListenPort(int listenPort) { */ public int getListenPort() { if (listenPort != 0) { - LOGGER.info("get current listen port: {}", listenPort); + LOGGER.debug("get current listen port: {}", listenPort); return listenPort; } String strPort = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL); int port = 0; try { port = Integer.parseInt(strPort); - LOGGER.info("get listen port from configuration: {}", port); + LOGGER.debug("get listen port from configuration: {}", port); } catch (NumberFormatException exx) { LOGGER.error("server service port set error:{}", exx.getMessage()); + port = XID.getPort(); + LOGGER.debug("get listen port from XID: {}", port); } if (port <= 0) { LOGGER.error("listen port: {} is invalid, will use default port:{}", port, SERVICE_DEFAULT_PORT); @@ -144,7 +146,7 @@ public int getListenPort() { @Override public void start() { - int port = XID.getPort(); + int port = getListenPort(); this.serverBootstrap.group(this.eventLoopGroupBoss, this.eventLoopGroupWorker) .channel(NettyServerConfig.SERVER_CHANNEL_CLAZZ) .option(ChannelOption.SO_BACKLOG, nettyServerConfig.getSoBackLogSize()) @@ -188,7 +190,7 @@ public void initChannel(SocketChannel ch) { @Override public void shutdown() { try { - int port = XID.getPort(); + int port = this.getListenPort(); if (LOGGER.isInfoEnabled()) { LOGGER.info("Shutting server down, the listen port: {}", port); } diff --git a/seata-spring-boot-starter/pom.xml b/seata-spring-boot-starter/pom.xml index b9856046036..c65fe7ed0a5 100644 --- a/seata-spring-boot-starter/pom.xml +++ b/seata-spring-boot-starter/pom.xml @@ -38,6 +38,18 @@ seata-spring-autoconfigure-client ${project.version} + + + ${project.groupId} + seata-all + ${project.version} + + + log4j + log4j + + + org.springframework diff --git a/server/pom.xml b/server/pom.xml index 530923e93fc..eb30888df5c 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -125,7 +125,7 @@ com.h2database h2 - + mysql mysql-connector-java diff --git a/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java b/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java index 77a7c647ef6..49c4a4f38d4 100644 --- a/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java +++ b/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java @@ -52,9 +52,9 @@ public static void putConfig(String dataId, String content) { try { boolean await = countDownLatch.await(PUT_CONFIG_TIMEOUT, TimeUnit.MILLISECONDS); - if (await) { + if(await){ LOGGER.info("putConfig ok, dataId={}, content={}", dataId, content); - } else { + }else { LOGGER.error("putConfig fail, dataId={}, content={}", dataId, content); } } catch (InterruptedException e) { diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java index 14123d0dd43..f78ab5a8698 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java @@ -50,6 +50,7 @@ public abstract class AbstractServerTest { protected static void startSeataServer() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AtomicBoolean started = new AtomicBoolean(false); + StringBuilder errorMsg = new StringBuilder(); // start seata-server (new Thread(() -> { @@ -90,6 +91,7 @@ protected static void startSeataServer() throws InterruptedException { started.set(true); LOGGER.info("Seata Server started"); } catch (Exception e) { + errorMsg.append(e.getMessage()); LOGGER.error("Start Seata Server error: {}", e.getMessage(), e); } finally { latch.countDown(); @@ -97,18 +99,18 @@ protected static void startSeataServer() throws InterruptedException { })).start(); // wait until seata-server started + LOGGER.info("Waiting for Seata Server to start..."); try { - LOGGER.info("Waiting for Seata Server to start..."); - latch.await(); - - if (started.get()) { - LOGGER.info("Seata Server started successfully"); - } else { - LOGGER.error("Seata Server failed to start"); - } - } catch (Exception e) { + } catch (InterruptedException e) { LOGGER.error("Wait seata-server start, but failed: {}", e.getMessage(), e); + throw new RuntimeException("Wait seata-server start, but failed: " + e.getMessage()); + } + + if (started.get()) { + LOGGER.info("Seata Server started successfully"); + } else { + throw new RuntimeException("Seata Server failed to start: " + errorMsg); } } diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java index eee895e664f..98532be3da7 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java @@ -77,8 +77,8 @@ public static void initApplicationContext() throws InterruptedException { @AfterAll public static void destory() throws InterruptedException { - ConfigurationTestHelper.removeConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL); stopSeataServer(); + ConfigurationTestHelper.removeConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL); } private GlobalTransaction getGlobalTransaction(StateMachineInstance instance) { From 998c753ea8b1dbb611392de6b090555cfcb3ab46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 10:31:26 +0800 Subject: [PATCH 31/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 573345dc7b8..ab8f186bb82 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -110,9 +110,9 @@ jobs: fail-fast: false matrix: springboot: [ - #2.7.18, # The maven-compiler-plugin will throw an error for an unknown reason. - #2.6.15, # The maven-compiler-plugin will throw an error for an unknown reason. - #2.5.15, # The maven-compiler-plugin will throw an error for an unknown reason. + 2.7.18, + 2.6.15, + 2.5.15, 2.4.13, 2.3.12.RELEASE, 2.2.13.RELEASE, From 83357e60ed68d1f00bbee872501d41eb32c6ca1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 11:28:53 +0800 Subject: [PATCH 32/52] modify 2.x.md --- changes/en-us/2.x.md | 1 + changes/zh-cn/2.x.md | 1 + dependencies-client/pom.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index ba6d1b1d3df..5c1b7cdece2 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -104,6 +104,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6366](https://github.com/apache/incubator-seata/pull/6366)] optimized globaltransaction compatibility issues - [[#6369](https://github.com/apache/incubator-seata/pull/6369)] optimize arm64 ci - [[#6386](https://github.com/apache/incubator-seata/pull/6386)] replace `byte-buddy` to JDK proxy in `ConfigurationCache` +- [[#6398](https://github.com/apache/incubator-seata/pull/6398)] Splitting dependencies for common, client, and server, and simplify pom - [[#6391](https://github.com/apache/incubator-seata/pull/6091)] forbid duplicate registration of TCC resources ### refactor: diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 446dd5558e3..6ef2411f676 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -108,6 +108,7 @@ - [[#6366](https://github.com/apache/incubator-seata/pull/6366)] 优化globaltransaction向下兼容性 - [[#6369](https://github.com/apache/incubator-seata/pull/6369)] 优化 arm64 ci - [[#6386](https://github.com/apache/incubator-seata/pull/6386)] 在 `ConfigurationCache` 类中，将 `byte-buddy` 替换为JDK代理 +- [[#6398](https://github.com/apache/incubator-seata/pull/6398)] 拆分通用、客户端、服务端的依赖，并简化pom.xml配置 - [[#6391](https://github.com/apache/incubator-seata/pull/6091)] 禁止重复注册TCC资源 diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index 697bdaeac61..833e63a4b2f 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -38,6 +38,7 @@ 4.8 + 1.5.9 From 5cea4cde74e7bf5f773520a8918f3fb03164fbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 14:41:31 +0800 Subject: [PATCH 33/52] =?UTF-8?q?=E7=AE=80=E5=8C=96=20dependencies-server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-server/pom.xml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 49382651b5d..182f7604b5b 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -35,8 +35,10 @@ dependencies for Seata server and console built with Maven - + 2.7.18 + + ${spring-boot-for-server.version} ${mysql.version} @@ -145,24 +147,6 @@ commons-compiler-jdk ${janino.version} - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot-for-server.version} - pom - import - From 99ecf355c22cbb791f1101a365b1cc974f889a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 15:18:35 +0800 Subject: [PATCH 34/52] =?UTF-8?q?=E8=A7=A3=E5=86=B3server=E7=AB=AF?= =?UTF-8?q?=E7=9A=84spring-boot=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A2=ABworkflo?= =?UTF-8?q?w=E4=B8=AD=E7=9A=84=E5=8F=98=E9=87=8F=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-server/pom.xml | 2 +- dependencies/pom.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index 182f7604b5b..a581d3cbc6a 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -38,7 +38,7 @@ 2.7.18 - ${spring-boot-for-server.version} + ${spring-boot-for-server.version} ${mysql.version} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index ad803f0fffa..079c65f40e9 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -113,6 +113,8 @@ 2.5.15 + + ${spring-boot.version} @@ -517,7 +519,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot.version} + ${spring-boot-dependencies.version} pom import From b22d9291fac18698ca2f8b7e29ee246435559e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 15:22:11 +0800 Subject: [PATCH 35/52] upgrade github actions --- .github/workflows/test-druid.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml index f004c41db81..83cd93ea3f9 100644 --- a/.github/workflows/test-druid.yml +++ b/.github/workflows/test-druid.yml @@ -44,10 +44,10 @@ jobs: steps: # step 1 - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.1 # step 2 - name: "Set up Java JDK" - uses: actions/setup-java@v3.12.0 + uses: actions/setup-java@v4.1.0 with: distribution: 'zulu' java-version: 8 From dd4bcaa86e03c1b626148bfdfca7b659f16ede78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 17:06:30 +0800 Subject: [PATCH 36/52] upgrade github actions --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 ++ .github/workflows/license-checker.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 319b653bfd9..7c6160ebcf7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: # step 5 - name: "Codecov" if: matrix.java == '8' - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v4.1.0 # job 2: Build on 'arm64v8/ubuntu' OS (Skip tests). build_arm64-binary: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 24d0a30e76d..80e0dc64038 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,6 +1,8 @@ name: "CodeQL" on: + push: + branches: [ 2.x, develop ] pull_request: # The branches below must be a subset of the branches above branches: [ 2.x, develop ] diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml index c513efb9707..e267d3f8be4 100644 --- a/.github/workflows/license-checker.yaml +++ b/.github/workflows/license-checker.yaml @@ -16,7 +16,7 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.1 # step 3 https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4.0.2 with: node-version: '14.x' # step 4 check license From 8313004171dd7cfb024cad28995bf85f1e76f6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 17:52:51 +0800 Subject: [PATCH 37/52] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies-server/pom.xml | 2 +- dependencies/pom.xml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dependencies-server/pom.xml b/dependencies-server/pom.xml index a581d3cbc6a..f0a97325daf 100644 --- a/dependencies-server/pom.xml +++ b/dependencies-server/pom.xml @@ -37,7 +37,7 @@ 2.7.18 - + ${spring-boot-for-server.version} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 079c65f40e9..d568aeb4061 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -113,7 +113,11 @@ 2.5.15 - + ${spring-boot.version} From bdf222b3daea1f3e98f4bf92f0a5d1430d2d6a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 21:58:15 +0800 Subject: [PATCH 38/52] =?UTF-8?q?1=EF=BC=89client=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=A7=BB=E9=99=A4logback=EF=BC=9B2?= =?UTF-8?q?=EF=BC=89=E4=BF=AE=E5=A4=8Dzkclient=E7=9A=84=E4=B8=80=E4=B8=AAe?= =?UTF-8?q?xclusion=E7=9A=84groupId=E5=92=8CarticleId=E5=8F=8D=E4=BA=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/pom.xml | 5 ----- config/seata-config-zk/pom.xml | 6 ------ dependencies-client/pom.xml | 25 ------------------------- dependencies/pom.xml | 8 ++++++-- discovery/seata-discovery-zk/pom.xml | 8 +------- 5 files changed, 7 insertions(+), 45 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index e19bdd1edbc..84e217c92d2 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -381,11 +381,6 @@ org.slf4j slf4j-api - - ch.qos.logback - logback-classic - provided - org.yaml snakeyaml diff --git a/config/seata-config-zk/pom.xml b/config/seata-config-zk/pom.xml index eacb1611367..9bb50098f6a 100644 --- a/config/seata-config-zk/pom.xml +++ b/config/seata-config-zk/pom.xml @@ -38,12 +38,6 @@ com.101tec zkclient - - - log4j - log4j - - diff --git a/dependencies-client/pom.xml b/dependencies-client/pom.xml index 833e63a4b2f..0f8a62d19cf 100644 --- a/dependencies-client/pom.xml +++ b/dependencies-client/pom.xml @@ -62,9 +62,6 @@ 5.0.0 - - - 1.3.14 @@ -241,16 +238,6 @@ org.codehaus.groovy groovy-all ${groovy.version} - - - org.junit.jupiter - junit-jupiter-engine - - - org.junit.platform - junit-platform-launcher - - @@ -259,18 +246,6 @@ rocketmq-client ${rocketmq-version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - diff --git a/dependencies/pom.xml b/dependencies/pom.xml index d568aeb4061..3528ab8cab2 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -192,13 +192,17 @@ slf4j-log4j12 org.slf4j + + log4j + log4j + io.netty netty - org.apache.zookeeper - zookeeper + org.apache.zookeeper + zookeeper diff --git a/discovery/seata-discovery-zk/pom.xml b/discovery/seata-discovery-zk/pom.xml index 6a4d83183a5..21f7cc73e25 100644 --- a/discovery/seata-discovery-zk/pom.xml +++ b/discovery/seata-discovery-zk/pom.xml @@ -38,12 +38,6 @@ com.101tec zkclient - - - log4j - log4j - - org.apache.curator @@ -60,6 +54,6 @@ jetty-servlet test - + From 8d56a2668f983c8d24e4f12240536382312cd45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 8 Mar 2024 23:18:19 +0800 Subject: [PATCH 39/52] =?UTF-8?q?=E7=A7=BB=E9=99=A4zkclient=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=B8=AAexclusion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 3528ab8cab2..2ba528a7381 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -200,10 +200,6 @@ io.netty netty - - org.apache.zookeeper - zookeeper - From 96044689599a4494fc35f741189fe9edff6c5075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 11 Mar 2024 16:17:17 +0800 Subject: [PATCH 40/52] =?UTF-8?q?dependencies=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/pom.xml | 4 ++-- compressor/pom.xml | 4 ++-- config/pom.xml | 4 ++-- console/pom.xml | 2 +- core/pom.xml | 4 ++-- .../dependencies-client}/pom.xml | 4 ++-- dependencies/{ => dependencies-common}/pom.xml | 3 ++- .../dependencies-server}/pom.xml | 4 ++-- discovery/pom.xml | 4 ++-- distribution/pom.xml | 2 +- ext/apm-seata-skywalking-plugin/pom.xml | 2 +- integration-tx-api/pom.xml | 2 +- integration/pom.xml | 2 +- metrics/pom.xml | 2 +- pom.xml | 6 +++--- rm-datasource/pom.xml | 2 +- rm/pom.xml | 2 +- rocketmq/pom.xml | 2 +- saga/pom.xml | 2 +- seata-plugin/pom.xml | 2 +- .../seata-spring-autoconfigure-client/pom.xml | 2 +- .../seata-spring-autoconfigure-core/pom.xml | 4 ++-- .../seata-spring-autoconfigure-server/pom.xml | 2 +- seata-spring-boot-starter/pom.xml | 2 +- serializer/pom.xml | 4 ++-- server/pom.xml | 2 +- spring/pom.xml | 2 +- sqlparser/pom.xml | 2 +- tcc/pom.xml | 2 +- test-mock-server/pom.xml | 2 +- test/pom.xml | 2 +- tm/pom.xml | 2 +- 32 files changed, 44 insertions(+), 43 deletions(-) rename {dependencies-client => dependencies/dependencies-client}/pom.xml (98%) rename dependencies/{ => dependencies-common}/pom.xml (99%) rename {dependencies-server => dependencies/dependencies-server}/pom.xml (98%) diff --git a/common/pom.xml b/common/pom.xml index ac310c43cb3..9dfcc5d8b3c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies/dependencies-common/pom.xml 4.0.0 seata-common diff --git a/compressor/pom.xml b/compressor/pom.xml index a94e0ebc1a5..2eb73e56a10 100644 --- a/compressor/pom.xml +++ b/compressor/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies/dependencies-common/pom.xml 4.0.0 seata-compressor diff --git a/config/pom.xml b/config/pom.xml index 467a07827e8..5d34cd034df 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies/dependencies-common/pom.xml 4.0.0 seata-config diff --git a/console/pom.xml b/console/pom.xml index 2fa7c7749b9..40e13e3da8a 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../dependencies-server/pom.xml + ../dependencies/dependencies-server/pom.xml 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 15c6987767d..343df6b0ec2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies/dependencies-common/pom.xml 4.0.0 seata-core diff --git a/dependencies-client/pom.xml b/dependencies/dependencies-client/pom.xml similarity index 98% rename from dependencies-client/pom.xml rename to dependencies/dependencies-client/pom.xml index 0f8a62d19cf..013eec34279 100644 --- a/dependencies-client/pom.xml +++ b/dependencies/dependencies-client/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies-common/pom.xml 4.0.0 diff --git a/dependencies/pom.xml b/dependencies/dependencies-common/pom.xml similarity index 99% rename from dependencies/pom.xml rename to dependencies/dependencies-common/pom.xml index 2ba528a7381..d7296817a2e 100644 --- a/dependencies/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -24,10 +24,11 @@ org.apache.seata seata-parent ${revision} + ../../pom.xml 4.0.0 - seata-dependencies + seata-dependencies-common pom diff --git a/dependencies-server/pom.xml b/dependencies/dependencies-server/pom.xml similarity index 98% rename from dependencies-server/pom.xml rename to dependencies/dependencies-server/pom.xml index f0a97325daf..33cf9429415 100644 --- a/dependencies-server/pom.xml +++ b/dependencies/dependencies-server/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies-common/pom.xml 4.0.0 diff --git a/discovery/pom.xml b/discovery/pom.xml index 674402655d5..c246a256665 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies/dependencies-common/pom.xml 4.0.0 pom diff --git a/distribution/pom.xml b/distribution/pom.xml index 5c690c2a0fc..ed585f7f8ab 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../dependencies-server/pom.xml + ../dependencies/dependencies-server/pom.xml 4.0.0 seata-distribution diff --git a/ext/apm-seata-skywalking-plugin/pom.xml b/ext/apm-seata-skywalking-plugin/pom.xml index 3ba08210fae..2a1a81facd3 100644 --- a/ext/apm-seata-skywalking-plugin/pom.xml +++ b/ext/apm-seata-skywalking-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../../dependencies-server/pom.xml + ../../dependencies/dependencies-server/pom.xml 4.0.0 apm-seata-skywalking-plugin diff --git a/integration-tx-api/pom.xml b/integration-tx-api/pom.xml index 2e3f4d117fa..e2f0a39ca93 100644 --- a/integration-tx-api/pom.xml +++ b/integration-tx-api/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-integration-tx-api diff --git a/integration/pom.xml b/integration/pom.xml index 462aad4e181..eb665b90db7 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 pom diff --git a/metrics/pom.xml b/metrics/pom.xml index 5387d7cb179..f6861a406a5 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../dependencies-server/pom.xml + ../dependencies/dependencies-server/pom.xml 4.0.0 pom diff --git a/pom.xml b/pom.xml index dddad5127d7..cba56569efb 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,9 @@ console core compatible - dependencies - dependencies-client - dependencies-server + dependencies/dependencies-common + dependencies/dependencies-client + dependencies/dependencies-server discovery distribution integration diff --git a/rm-datasource/pom.xml b/rm-datasource/pom.xml index 7dc86142f25..e35b221cb7a 100644 --- a/rm-datasource/pom.xml +++ b/rm-datasource/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-rm-datasource diff --git a/rm/pom.xml b/rm/pom.xml index e4946f07e9c..3513b30b07c 100644 --- a/rm/pom.xml +++ b/rm/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-rm diff --git a/rocketmq/pom.xml b/rocketmq/pom.xml index fe53a913f13..075bd28a838 100644 --- a/rocketmq/pom.xml +++ b/rocketmq/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-rocketmq diff --git a/saga/pom.xml b/saga/pom.xml index b6aa8a4b6b4..398fa0d419a 100644 --- a/saga/pom.xml +++ b/saga/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 pom diff --git a/seata-plugin/pom.xml b/seata-plugin/pom.xml index 10aad933d8f..38d1a24cc68 100644 --- a/seata-plugin/pom.xml +++ b/seata-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml index e947bb559a2..efe32429ca7 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../../dependencies-client/pom.xml + ../../dependencies/dependencies-client/pom.xml 4.0.0 diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml index 2b8c30a74d3..57b23d35ef2 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../../dependencies/pom.xml + ../../dependencies/dependencies-common/pom.xml 4.0.0 diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml b/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml index 2bd510e2844..81b2f50fd1d 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-server/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../../dependencies-server/pom.xml + ../../dependencies/dependencies-server/pom.xml 4.0.0 diff --git a/seata-spring-boot-starter/pom.xml b/seata-spring-boot-starter/pom.xml index c65fe7ed0a5..d4b91d04c32 100644 --- a/seata-spring-boot-starter/pom.xml +++ b/seata-spring-boot-starter/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-spring-boot-starter diff --git a/serializer/pom.xml b/serializer/pom.xml index 6a77926e99d..7aa0a65d571 100644 --- a/serializer/pom.xml +++ b/serializer/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-dependencies + seata-dependencies-common ${revision} - ../dependencies/pom.xml + ../dependencies/dependencies-common/pom.xml 4.0.0 seata-serializer diff --git a/server/pom.xml b/server/pom.xml index eb30888df5c..9eb80efd796 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../dependencies-server/pom.xml + ../dependencies/dependencies-server/pom.xml 4.0.0 diff --git a/spring/pom.xml b/spring/pom.xml index 7d0366f4704..9486d3e2229 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-spring diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml index ae07c7e21b5..3444aca1a07 100644 --- a/sqlparser/pom.xml +++ b/sqlparser/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-sqlparser diff --git a/tcc/pom.xml b/tcc/pom.xml index 230d43b409b..12df0126855 100644 --- a/tcc/pom.xml +++ b/tcc/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-tcc diff --git a/test-mock-server/pom.xml b/test-mock-server/pom.xml index 29edcaaa77a..b633488c12e 100644 --- a/test-mock-server/pom.xml +++ b/test-mock-server/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-server ${revision} - ../dependencies-server/pom.xml + ../dependencies/dependencies-server/pom.xml 4.0.0 diff --git a/test/pom.xml b/test/pom.xml index e8d571f5520..09898aa8e94 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-test diff --git a/tm/pom.xml b/tm/pom.xml index 62ea836b64a..f82063857a4 100644 --- a/tm/pom.xml +++ b/tm/pom.xml @@ -24,7 +24,7 @@ org.apache.seata seata-dependencies-client ${revision} - ../dependencies-client/pom.xml + ../dependencies/dependencies-client/pom.xml 4.0.0 seata-tm From d28c67d1aade8fc1fd274a8306d3053b5bd818fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 11 Mar 2024 17:57:10 +0800 Subject: [PATCH 41/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0dependencies-base?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=B0=86dependencies-common?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE=E8=BD=AC?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=E5=AE=83=E9=87=8C=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 9 +- compatible/pom.xml | 6 + dependencies/dependencies-client/pom.xml | 6 + dependencies/dependencies-common/pom.xml | 448 +++------------------- dependencies/pom.xml | 456 +++++++++++++++++++++++ pom.xml | 4 +- rm-datasource/pom.xml | 5 - 7 files changed, 517 insertions(+), 417 deletions(-) create mode 100644 dependencies/pom.xml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab8f186bb82..15c518fc1db 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,6 +46,7 @@ jobs: ./mvnw -version; ./mvnw -T 4C clean test \ -P args-for-client-test \ + -P priority-spring-boot-dependencies \ -Dspring-boot.version=${{ matrix.springboot }} \ -Dmaven.git-commit-id.skip=true \ -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; @@ -54,7 +55,7 @@ jobs: if: matrix.os == 'windows' run: | # Skip tests, because too many errors in unit-test. ./mvnw.cmd -version; - ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + ./mvnw.cmd clean install -P args-for-client-test -DskipTests -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; # job 2 test-springboot3x: @@ -92,6 +93,7 @@ jobs: ./mvnw -version; ./mvnw -T 4C clean install \ -P args-for-client-test \ + -P priority-spring-boot-dependencies \ -Dspring-boot.version=${{ matrix.springboot }} \ -Dmaven.git-commit-id.skip=true \ -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; @@ -100,7 +102,7 @@ jobs: if: matrix.os == 'windows' run: | # Skip tests, because too many errors in unit-test. ./mvnw.cmd -version; - ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + ./mvnw.cmd clean install -P args-for-client-test -DskipTests -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; # job 3 test-arm64: @@ -136,8 +138,9 @@ jobs: apt-get install maven -y && \ mvn -version && \ mvn -T 4C clean install \ - -Dspring-boot.version=${{ matrix.springboot }} \ -Prelease-seata \ + -Ppriority-spring-boot-dependencies \ + -Dspring-boot.version=${{ matrix.springboot }} \ -DskipTests \ -Dmaven.git-commit-id.skip=true \ -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/compatible/pom.xml b/compatible/pom.xml index b4e49933736..89083d17c70 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -95,6 +95,12 @@ httpclient 4.5.14 provided + + + commons-logging + commons-logging + + org.springframework diff --git a/dependencies/dependencies-client/pom.xml b/dependencies/dependencies-client/pom.xml index 013eec34279..d7d4367a461 100644 --- a/dependencies/dependencies-client/pom.xml +++ b/dependencies/dependencies-client/pom.xml @@ -245,6 +245,12 @@ org.apache.rocketmq rocketmq-client ${rocketmq-version} + + + commons-logging + commons-logging + + diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index d7296817a2e..8233c89e08a 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -22,9 +22,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.seata - seata-parent + seata-dependencies-base ${revision} - ../../pom.xml 4.0.0 @@ -32,30 +31,21 @@ pom - Seata dependencies ${project.version} - dependencies for Seata built with Maven + Seata dependencies-common ${project.version} + dependencies-common for Seata built with Maven 1 - - 2.6 - 1.2 - 1.21 32.1.3-jre - - 4.1.94.Final 1.2.83 - - 3.8.0 + 0.3.1 0.11 3.7.2 - - 1.12.17 1.10.12 @@ -81,10 +71,8 @@ 1.6.7 1.10.18 5.1.0 + 2.4.0 1.4.20 - - 4.4.16 - 4.5.14 3.16.3 @@ -104,22 +92,6 @@ 1.2.7 2.9.0 3.4.3 - - - 4.11.0 - 3.12.2 - 5.8.2 - 9.4.38.v20210224 - 2.4.0 - - - 2.5.15 - - ${spring-boot.version} @@ -131,23 +103,6 @@ ${javax-inject.version} - - - commons-lang - commons-lang - ${commons-lang.version} - - - commons-logging - commons-logging - ${commons-logging.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - com.google.guava @@ -155,15 +110,6 @@ ${guava.version} - - - io.netty - netty-bom - ${netty.version} - pom - import - - com.alibaba @@ -171,12 +117,7 @@ ${fastjson.version} - - - redis.clients - jedis - ${jedis.version} - + com.github.microwww redis-server @@ -215,18 +156,6 @@ - - - net.bytebuddy - byte-buddy - ${bytebuddy.version} - - - net.bytebuddy - byte-buddy-agent - ${bytebuddy.version} - - com.alibaba @@ -237,6 +166,12 @@ org.apache.commons commons-dbcp2 ${commons-dbcp2.version} + + + commons-logging + commons-logging + + com.zaxxer @@ -323,6 +258,12 @@ com.ecwid.consul consul-api ${consul-clients.version} + + + commons-logging + commons-logging + + io.etcd @@ -370,7 +311,7 @@ ${apollo-client.version} - + org.apache.curator curator-test @@ -414,6 +355,10 @@ org.codehaus.jettison jettison + + commons-logging + commons-logging + @@ -440,6 +385,10 @@ org.scijava native-lib-loader + + org.apache.commons + commons-compress + @@ -462,341 +411,28 @@ - - org.eclipse.jetty - jetty-bom - ${jetty.version} - pom - import - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - - - - org.mockito - mockito-core - ${mockito.version} - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - - - org.mockito - mockito-inline - ${mockito.version} - - - org.mockito - mockito-bom - ${mockito.version} - pom - import - - - - org.assertj - assertj-core - ${assertj.version} - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot-dependencies.version} - pom - import - + - - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.platform - junit-platform-launcher - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - org.mockito - mockito-inline - test - - - org.assertj - assertj-core - test - - - org.slf4j - slf4j-simple - test - - - - - - licenseCheck - - - - org.codehaus.mojo - license-maven-plugin - - - license-check - generate-sources - - add-third-party - - - false - false - false - - Apache License, Version 2.0|The Apache Software License, Version - 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License - v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software - License, Version 2.0 - - The MIT License|MIT License - The 3-Clause BSD License|New BSD License|3-Clause BSD - License|BSD|3-Clause BSD License|The New BSD License - - - - - - - - - - - - arrch64 - - osx-x86_64 - - - + - checkstyle - - [1.8,) - - - - - com.mycila - license-maven-plugin - - - generate-sources - - remove - format - - - - - true -
${user.dir}/style/copyright
- - **/src/main/java/** - **/src/test/java/** - **/*.xml - **/*.sql - **/*.conf - **/*.yml - **/*.yaml - **/*.sh - **/*.bat - **/*.lua - **/*.properties - **/*.txt - **/*.def - - - **/generated/** - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - true - - SLASHSTAR_STYLE - DOUBLEBAR_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - validate - validate - - ${user.dir}/style/seata_checkstyle.xml - ${user.dir}/style/seata_suppressions.xml - - UTF-8 - true - true - - - checkstyle - - - - - - - - - - - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - **/*.java.template - - - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - ${project.build.sourceEncoding} - 2 - true - - rulesets/java/ali-comment.xml - rulesets/java/ali-concurrent.xml - rulesets/java/ali-constant.xml - rulesets/java/ali-exception.xml - rulesets/java/ali-flowcontrol.xml - rulesets/java/ali-naming.xml - rulesets/java/ali-oop.xml - rulesets/java/ali-orm.xml - rulesets/java/ali-other.xml - rulesets/java/ali-set.xml - - - **/generated/*.java - **/antlr/mysql/parser/*.* - **/antlr/mysql/antlr/*.* - **/antlr/mysql/stream/ANTLRNoCaseStringStream.java - - - - - pmd-check - validate - - check - - - + priority-spring-boot-dependencies + - com.alibaba.p3c - p3c-pmd - ${p3c-pmd.version} + org.springframework.boot + spring-boot-dependencies + ${spring-boot-dependencies.version} + pom + import - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${maven.surefire.argLine} - ${maven.surefire.excludes} - - - - + + + diff --git a/dependencies/pom.xml b/dependencies/pom.xml new file mode 100644 index 00000000000..645b1eb3c5c --- /dev/null +++ b/dependencies/pom.xml @@ -0,0 +1,456 @@ + + + + + org.apache.seata + seata-parent + ${revision} + + 4.0.0 + + seata-dependencies-base + pom + + Seata dependencies-base ${project.version} + dependencies-base for Seata built with Maven + + + dependencies-common + dependencies-client + dependencies-server + + + + + 2.6 + + + 4.1.94.Final + + 9.4.38.v20210224 + + 4.4.16 + 4.5.14 + + 1.12.17 + + + 3.8.0 + + + 5.8.2 + 4.11.0 + 3.12.2 + + + 2.5.15 + + ${spring-boot.version} + + + + + + + commons-lang + commons-lang + ${commons-lang.version} + + + + + io.netty + netty-bom + ${netty.version} + pom + import + + + + + org.eclipse.jetty + jetty-bom + ${jetty.version} + pom + import + + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + commons-logging + commons-logging + + + + + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + + + + + redis.clients + jedis + ${jedis.version} + + + + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + + org.mockito + mockito-core + ${mockito.version} + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + + + org.mockito + mockito-inline + ${mockito.version} + + + org.mockito + mockito-bom + ${mockito.version} + pom + import + + + + org.assertj + assertj-core + ${assertj.version} + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot-dependencies.version} + pom + import + + + + + + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.platform + junit-platform-launcher + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.mockito + mockito-inline + test + + + org.assertj + assertj-core + test + + + org.slf4j + slf4j-simple + test + + + + + + + licenseCheck + + + + org.codehaus.mojo + license-maven-plugin + + + license-check + generate-sources + + add-third-party + + + false + false + false + + Apache License, Version 2.0|The Apache Software License, Version + 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0 License|Apache 2.0|Apache License + v2.0|Apache License 2.0|The Apache License, Version 2.0|The Apache Software + License, Version 2.0 + + The MIT License|MIT License + The 3-Clause BSD License|New BSD License|3-Clause BSD + License|BSD|3-Clause BSD License|The New BSD License + + + + + + + + + + + + arrch64 + + osx-x86_64 + + + + + checkstyle + + [1.8,) + + + + + com.mycila + license-maven-plugin + + + generate-sources + + remove + format + + + + + true +
${user.dir}/style/copyright
+ + **/src/main/java/** + **/src/test/java/** + **/*.xml + **/*.sql + **/*.conf + **/*.yml + **/*.yaml + **/*.sh + **/*.bat + **/*.lua + **/*.properties + **/*.txt + **/*.def + + + **/generated/** + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + true + + SLASHSTAR_STYLE + DOUBLEBAR_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + validate + validate + + ${user.dir}/style/seata_checkstyle.xml + ${user.dir}/style/seata_suppressions.xml + + UTF-8 + true + true + + + checkstyle + + + + + + + + + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + **/*.java.template + + + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + ${project.build.sourceEncoding} + 2 + true + + rulesets/java/ali-comment.xml + rulesets/java/ali-concurrent.xml + rulesets/java/ali-constant.xml + rulesets/java/ali-exception.xml + rulesets/java/ali-flowcontrol.xml + rulesets/java/ali-naming.xml + rulesets/java/ali-oop.xml + rulesets/java/ali-orm.xml + rulesets/java/ali-other.xml + rulesets/java/ali-set.xml + + + **/generated/*.java + **/antlr/mysql/parser/*.* + **/antlr/mysql/antlr/*.* + **/antlr/mysql/stream/ANTLRNoCaseStringStream.java + + + + + pmd-check + validate + + check + + + + + + com.alibaba.p3c + p3c-pmd + ${p3c-pmd.version} + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + test + + report + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + ${maven.surefire.argLine} + ${maven.surefire.excludes} + + + + + diff --git a/pom.xml b/pom.xml index cba56569efb..746b1a17774 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,7 @@ console core compatible - dependencies/dependencies-common - dependencies/dependencies-client - dependencies/dependencies-server + dependencies discovery distribution integration diff --git a/rm-datasource/pom.xml b/rm-datasource/pom.xml index e35b221cb7a..e25ed57f13e 100644 --- a/rm-datasource/pom.xml +++ b/rm-datasource/pom.xml @@ -128,10 +128,5 @@ mariadb-java-client test - - commons-logging - commons-logging - true - From 17be3bf3eba7cf972bafeee0f96bcfb40cc93a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 11 Mar 2024 18:06:39 +0800 Subject: [PATCH 42/52] revert commons-xxx --- compatible/pom.xml | 6 ------ dependencies/dependencies-client/pom.xml | 6 ------ dependencies/dependencies-common/pom.xml | 20 -------------------- dependencies/pom.xml | 12 ++++++++++++ rm-datasource/pom.xml | 5 +++++ 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/compatible/pom.xml b/compatible/pom.xml index 89083d17c70..b4e49933736 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -95,12 +95,6 @@ httpclient 4.5.14 provided - - - commons-logging - commons-logging - - org.springframework diff --git a/dependencies/dependencies-client/pom.xml b/dependencies/dependencies-client/pom.xml index d7d4367a461..013eec34279 100644 --- a/dependencies/dependencies-client/pom.xml +++ b/dependencies/dependencies-client/pom.xml @@ -245,12 +245,6 @@ org.apache.rocketmq rocketmq-client ${rocketmq-version} - - - commons-logging - commons-logging - - diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index 8233c89e08a..2b84add7c52 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -166,12 +166,6 @@ org.apache.commons commons-dbcp2 ${commons-dbcp2.version} - - - commons-logging - commons-logging - - com.zaxxer @@ -258,12 +252,6 @@ com.ecwid.consul consul-api ${consul-clients.version} - - - commons-logging - commons-logging - - io.etcd @@ -355,10 +343,6 @@ org.codehaus.jettison jettison - - commons-logging - commons-logging - @@ -385,10 +369,6 @@ org.scijava native-lib-loader - - org.apache.commons - commons-compress - diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 645b1eb3c5c..1b7a23c3882 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -42,6 +42,8 @@ 2.6 + 1.2 + 1.21 4.1.94.Final @@ -79,6 +81,16 @@ commons-lang ${commons-lang.version} + + commons-logging + commons-logging + ${commons-logging.version} + + + org.apache.commons + commons-compress + ${commons-compress.version} + diff --git a/rm-datasource/pom.xml b/rm-datasource/pom.xml index e25ed57f13e..e35b221cb7a 100644 --- a/rm-datasource/pom.xml +++ b/rm-datasource/pom.xml @@ -128,5 +128,10 @@ mariadb-java-client test + + commons-logging + commons-logging + true + From d5b67d151cd5dbb9d2e49253b890407a47ae491a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 12 Mar 2024 14:31:22 +0800 Subject: [PATCH 43/52] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/dependencies-common/pom.xml | 281 ++++++++++++++--------- dependencies/pom.xml | 67 ------ 2 files changed, 171 insertions(+), 177 deletions(-) diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index 2b84add7c52..c47a93cc9eb 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -35,18 +35,39 @@ dependencies-common for Seata built with Maven + + 2.6 + 1.2 + 1.21 + + 1.12.17 1 32.1.3-jre 1.2.83 + + 3.8.0 - 0.3.1 + 0.3.1 0.11 3.7.2 + + + 5.1.42 + 19.3.0.0 + 8.1.2.192 + 42.3.8 + 1.4.181 + 2.7.2 + + 1.2.7 + 2.9.0 + 3.4.3 + 1.10.12 1.7.1 @@ -56,46 +77,64 @@ 1.2.1 2.0 2.0.1 - - 1.4.2 1.4.6 + 1.4.2 0.5.0 - + 1.10.18 1.5.4 - 1.11.2 0.7.6 + + 1.11.2 6.3.0 4.0.3 1.6.7 - 1.10.18 - 5.1.0 2.4.0 1.4.20 + 5.1.0 + + 4.4.16 + 4.5.14 3.16.3 5.4.0 0.45 4.0.63 - - - - 5.1.42 - 19.3.0.0 - 8.1.2.192 - 42.3.8 - 1.4.181 - 2.7.2 - - 1.2.7 - 2.9.0 - 3.4.3 + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-logging + commons-logging + ${commons-logging.version} + + + org.apache.commons + commons-compress + ${commons-compress.version} + + + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + + javax.inject @@ -117,11 +156,17 @@ ${fastjson.version} + + + redis.clients + jedis + ${jedis.version} + com.github.microwww redis-server - ${mock-jedis.version} + ${mock-redis-server.version} @@ -200,31 +245,7 @@ ${mariadb.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - - - com.esotericsoftware - kryo - ${kryo.version} - - - de.javakaffee - kryo-serializers - ${kryo-serializers.version} - - - com.caucho - hessian - ${hessian.version} - - - + org.apache.ant ant @@ -240,19 +261,38 @@ lz4-java ${lz4.version} - - + + + com.typesafe + config + ${config.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + com.ctrip.framework.apollo + apollo-client + ${apollo-client.version} + + + + com.alibaba.nacos nacos-client ${nacos-client.version} + com.ecwid.consul consul-api ${consul-clients.version} + io.etcd jetcd-core @@ -280,56 +320,46 @@ - - + + - com.typesafe - config - ${config.version} - - - org.yaml - snakeyaml - ${snakeyaml.version} + io.etcd + jetcd-launcher + ${etcd-client-v3.version} - com.ctrip.framework.apollo - apollo-client - ${apollo-client.version} + org.testcontainers + testcontainers + ${testcontainers.version} + + + org.scijava + native-lib-loader + + - - - org.apache.curator - curator-test - ${curator-test.version} + org.scijava + native-lib-loader + ${native-lib-loader.version} - com.alipay.sofa - registry-client-all - ${sofa.registry.version} + com.thoughtworks.xstream + xstream + ${xstream.version} - com.alipay.sofa.lookout - lookout-api + * + org.glassfish.jersey - com.alipay.sofa - hessian + xmlpull + xmlpull - - com.alipay.sofa - hessian - ${sofa.hessian.version} - - - com.alipay.sofa - bolt - ${sofa.bolt.version} - + com.netflix.eureka eureka-client @@ -355,43 +385,74 @@ archaius-core ${archaius-core.version} + - io.etcd - jetcd-launcher - ${etcd-client-v3.version} - - - org.testcontainers - testcontainers - ${testcontainers.version} + com.alipay.sofa + registry-client-all + ${sofa.registry.version} - org.scijava - native-lib-loader + com.alipay.sofa.lookout + lookout-api + + + com.alipay.sofa + hessian - org.scijava - native-lib-loader - ${native-lib-loader.version} + com.alipay.sofa + bolt + ${sofa.bolt.version} - com.thoughtworks.xstream - xstream - ${xstream.version} - - - * - org.glassfish.jersey - - - xmlpull - xmlpull - - + com.alipay.sofa + hessian + ${sofa.hessian.version} + + + + org.apache.curator + curator-test + ${curator-test.version} + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + com.esotericsoftware + kryo + ${kryo.version} + + + de.javakaffee + kryo-serializers + ${kryo-serializers.version} + + + + com.caucho + hessian + ${hessian.version} - diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 1b7a23c3882..bc1615c970d 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -40,23 +40,10 @@ - - 2.6 - 1.2 - 1.21 - 4.1.94.Final 9.4.38.v20210224 - - 4.4.16 - 4.5.14 - - 1.12.17 - - - 3.8.0 5.8.2 @@ -75,23 +62,6 @@ - - - commons-lang - commons-lang - ${commons-lang.version} - - - commons-logging - commons-logging - ${commons-logging.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - io.netty @@ -110,43 +80,6 @@ import - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - commons-logging - commons-logging - - - - - - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - - - net.bytebuddy - byte-buddy-agent - ${byte-buddy.version} - - - - - redis.clients - jedis - ${jedis.version} - - From 8b0906ec369fdb7c963ae0a3903e06fcc0aae21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 12 Mar 2024 15:05:52 +0800 Subject: [PATCH 44/52] =?UTF-8?q?=E7=AE=80=E5=8C=96mockito=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index bc1615c970d..077ad0fc9d4 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -90,21 +90,6 @@ import - - org.mockito - mockito-core - ${mockito.version} - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - - - org.mockito - mockito-inline - ${mockito.version} - org.mockito mockito-bom From 96927d5f55c31529406206c8d66da8f9f90bd6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 12 Mar 2024 15:09:44 +0800 Subject: [PATCH 45/52] upgrade spring-boot 3.x in test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 15c518fc1db..ca38b3c1680 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,8 +71,8 @@ jobs: windows, # Skip tests, because too many errors in unit-test. ] springboot: [ - 3.2.0, - 3.1.6, + 3.2.3, + 3.1.9, 3.0.13 ] steps: From d92dd5d838f99c37a5348ae0eae82bddf265662e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 12 Mar 2024 15:26:04 +0800 Subject: [PATCH 46/52] Fix the version number of junit5 in test.yml --- dependencies/dependencies-common/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index c47a93cc9eb..a80613cf222 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -465,6 +465,13 @@ priority-spring-boot-dependencies + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + org.springframework.boot spring-boot-dependencies From d922a76b02029d6cb5017dce82efd9d8e9108336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 12 Mar 2024 15:51:59 +0800 Subject: [PATCH 47/52] Fix the version number of mockito in test.yml --- dependencies/dependencies-common/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index a80613cf222..6dca9bf0bac 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -465,6 +465,7 @@ priority-spring-boot-dependencies + org.junit junit-bom @@ -472,6 +473,16 @@ pom import + + + org.mockito + mockito-bom + ${mockito.version} + pom + import + + + org.springframework.boot spring-boot-dependencies From e59cc3a6c076be3ea158720d804b3c4088c13674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 13 Mar 2024 16:10:48 +0800 Subject: [PATCH 48/52] =?UTF-8?q?java21=E4=B8=8B=EF=BC=8C=E5=8D=87?= =?UTF-8?q?=E7=BA=A7mockito=E7=9A=84=E7=89=88=E6=9C=AC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 6 ++++-- dependencies/dependencies-common/pom.xml | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ca38b3c1680..23b633df04a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,6 +45,7 @@ jobs: run: | ./mvnw -version; ./mvnw -T 4C clean test \ + -P test-by-java${{ matrix.java }} \ -P args-for-client-test \ -P priority-spring-boot-dependencies \ -Dspring-boot.version=${{ matrix.springboot }} \ @@ -55,7 +56,7 @@ jobs: if: matrix.os == 'windows' run: | # Skip tests, because too many errors in unit-test. ./mvnw.cmd -version; - ./mvnw.cmd clean install -P args-for-client-test -DskipTests -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + ./mvnw.cmd clean install -DskipTests -P test-by-java${{ matrix.java }} -P args-for-client-test -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; # job 2 test-springboot3x: @@ -92,6 +93,7 @@ jobs: run: | ./mvnw -version; ./mvnw -T 4C clean install \ + -P test-by-java${{ matrix.java }} \ -P args-for-client-test \ -P priority-spring-boot-dependencies \ -Dspring-boot.version=${{ matrix.springboot }} \ @@ -102,7 +104,7 @@ jobs: if: matrix.os == 'windows' run: | # Skip tests, because too many errors in unit-test. ./mvnw.cmd -version; - ./mvnw.cmd clean install -P args-for-client-test -DskipTests -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; + ./mvnw.cmd clean install -DskipTests -P test-by-java${{ matrix.java }} -P args-for-client-test -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; # job 3 test-arm64: diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index 6dca9bf0bac..c9d0c705457 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -493,5 +493,12 @@ + + + test-by-java21 + + 5.2.0 + + From 4a2942ac15fc5f61f2f9c0c10fd2ade0b0436c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 13 Mar 2024 17:08:00 +0800 Subject: [PATCH 49/52] =?UTF-8?q?java21=E4=B8=8B=EF=BC=8C=E5=8D=87?= =?UTF-8?q?=E7=BA=A7byte-buddy=E7=9A=84=E7=89=88=E6=9C=AC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/dependencies-common/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/dependencies-common/pom.xml b/dependencies/dependencies-common/pom.xml index c9d0c705457..1449563c046 100644 --- a/dependencies/dependencies-common/pom.xml +++ b/dependencies/dependencies-common/pom.xml @@ -40,7 +40,7 @@ 1.2 1.21 - 1.12.17 + 1.12.23 1 @@ -497,7 +497,7 @@ test-by-java21 - 5.2.0 + 1.14.12 From 5df0bcfb5a4bbd7880a724c0f6de02e9d64f9592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 1 Apr 2024 10:39:23 +0800 Subject: [PATCH 50/52] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies/dependencies-client/pom.xml | 4 ++-- dependencies/pom.xml | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dependencies/dependencies-client/pom.xml b/dependencies/dependencies-client/pom.xml index 013eec34279..d0393db32e7 100644 --- a/dependencies/dependencies-client/pom.xml +++ b/dependencies/dependencies-client/pom.xml @@ -54,8 +54,8 @@ 5.6.5 - 1.4.32 - 1.4.3 + 1.7.22 + 1.7.3 2.4.4 diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 077ad0fc9d4..e4fce29fee7 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -127,6 +127,16 @@ junit-platform-launcher test + + org.junit.platform + junit-platform-suite-api + test + + + org.junit.platform + junit-platform-suite-engine + test + org.mockito mockito-core From 818822edae2bbf0b537ee80d07f703a552682cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 1 Apr 2024 11:13:58 +0800 Subject: [PATCH 51/52] =?UTF-8?q?=E5=8D=95=E6=B5=8B=E5=B0=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apache/seata/common/ConfigurationTestHelper.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java b/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java index eafd88cb526..5045d21c286 100644 --- a/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java +++ b/test/src/test/java/org/apache/seata/common/ConfigurationTestHelper.java @@ -41,21 +41,13 @@ public static void removeConfig(String dataId) { } public static void putConfig(String dataId, String content) { - CountDownLatch countDownLatch = new CountDownLatch(1); - ConfigurationFactory.getInstance().addConfigListener(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, - new CachedConfigurationChangeListener() { - @Override - public void onChangeEvent(ConfigurationChangeEvent event) { - countDownLatch.countDown(); - } - }); if (content == null) { removeConfig(dataId); return; } CountDownLatch countDownLatch = new CountDownLatch(1); - ConfigurationCache.addConfigListener(dataId, event -> countDownLatch.countDown()); + ConfigurationFactory.getInstance().addConfigListener(dataId, event -> countDownLatch.countDown()); System.setProperty(dataId, content); ConfigurationFactory.getInstance().putConfig(dataId, content); From 8261052cd93c26a1b6494585fd085b3d1b2040b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 1 Apr 2024 12:26:50 +0800 Subject: [PATCH 52/52] =?UTF-8?q?=E5=8D=95=E6=B5=8B=E5=B0=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seata/config/FileConfigurationTest.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/config/seata-config-core/src/test/java/org/apache/seata/config/FileConfigurationTest.java b/config/seata-config-core/src/test/java/org/apache/seata/config/FileConfigurationTest.java index 5c754e0b8b2..15f929837b6 100644 --- a/config/seata-config-core/src/test/java/org/apache/seata/config/FileConfigurationTest.java +++ b/config/seata-config-core/src/test/java/org/apache/seata/config/FileConfigurationTest.java @@ -40,22 +40,24 @@ void tearDown() { @Test void addConfigListener() throws InterruptedException { Configuration fileConfig = ConfigurationFactory.getInstance(); - CountDownLatch countDownLatch = new CountDownLatch(1); String dataId = "service.disableGlobalTransaction"; + + CountDownLatch countDownLatch = new CountDownLatch(1); boolean value = fileConfig.getBoolean(dataId); - fileConfig.addConfigListener(dataId, new CachedConfigurationChangeListener() { - @Override - public void onChangeEvent(ConfigurationChangeEvent event) { - Assertions.assertEquals(Boolean.parseBoolean(event.getNewValue()), - !Boolean.parseBoolean(event.getOldValue())); - countDownLatch.countDown(); - } - }); + fileConfig.addConfigListener(dataId, event -> { + Assertions.assertEquals(Boolean.parseBoolean(event.getNewValue()), + !Boolean.parseBoolean(event.getOldValue())); + countDownLatch.countDown(); + }); System.setProperty(dataId, String.valueOf(!value)); - countDownLatch.await(2, TimeUnit.SECONDS); + countDownLatch.await(20, TimeUnit.SECONDS); + Assertions.assertEquals(value, !fileConfig.getBoolean(dataId)); + System.setProperty("file.listener.enabled", "false"); + //wait for loop safety, loop time is LISTENER_CONFIG_INTERVAL=1s Thread.sleep(1500); + System.setProperty(dataId, String.valueOf(value)); //sleep for a period of time to simulate waiting for a cache refresh.Actually, it doesn't trigger. Thread.sleep(1000);