Merge branch '2.x' into add_test_02

apache · Nov 29, 2024 · c5283da · c5283da
2 parents 76a77dd + 7975aa5
commit c5283da
Show file tree

Hide file tree

Showing 230 changed files with 15,765 additions and 2,216 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -84,11 +84,15 @@ jobs:
       - name: "Set up QEMU"
         id: qemu
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-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 \
+            --platform linux/arm64 arm64v8/ubuntu:20.04 \
             bash -exc 'apt-get update -y && \
                        apt-get install maven -y && \
                        apt-get install -y python3 python3-pip python3-distutils && \

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 17 ]
+        java: [ 8, 17, 21 ]
     steps:
       # step 1
       - name: "Checkout"
@@ -39,10 +39,9 @@ jobs:
           REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
         run: |
           if [ "${{ github.ref_name }}" == "develop" ] || [ "${{ github.ref_name }}" == "snapshot"  || [ "${{ github.ref_name }}" == "2.x" ]; then
-            ./mvnw -T 4C clean package -Dimage.name=openjdk:8u342      -Pimage                                    -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+            ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk      -Pimage                                    -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           else
-            ./mvnw -T 4C clean package -Dimage.name=openjdk:8u342      -Pimage,release-image-based-on-java8       -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-            ./mvnw -T 4C clean package -Dimage.name=openjdk:8u342-slim -Pimage,release-image-based-on-java8-slim  -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+            ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk      -Pimage,release-image-based-on-java8       -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           fi
       # step 4 based on java17
       - name: "Publish images to DockerHub based on java17"
@@ -51,5 +50,12 @@ jobs:
           REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
           REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
         run: |
-          ./mvnw -T 4C clean package -Dimage.name=openjdk:17.0.2       -Pimage,release-image-based-on-java17      -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-          ./mvnw -T 4C clean package -Dimage.name=openjdk:17.0.2-slim  -Pimage,release-image-based-on-java17-slim -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:17.0.12_7-jdk       -Pimage,release-image-based-on-java17      -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+      # step 5 based on java21
+      - name: "Publish images to DockerHub based on java21"
+        if: ${{ matrix.java == 21 && github.ref_name != 'develop' && github.ref_name != 'snapshot' && github.ref_name != '2.x' }}
+        env:
+          REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
+          REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+        run: |
+          ./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:21.0.4_7-jdk       -Pimage,release-image-based-on-java21      -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
@@ -6,6 +6,20 @@ on:
 
 jobs:
   test-druid:
+    services:
+      redis:
+        image: redis:7.2
+        ports:
+          - 6379:6379
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      nacos:
+        image: nacos/nacos-server:v2.4.2
+        ports:
+          - 8848:8848
+        env:
+          MODE: standalone
+          SPRING_SECURITY_ENABLED: false
+        options: --health-cmd="curl -f http://localhost:8848/nacos" --health-interval=10s --health-timeout=5s --health-retries=3 --health-start-period=30s
     name: "test-druid"
     runs-on: ubuntu-latest
     strategy:

diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml
@@ -0,0 +1,162 @@
+name: "test-ubuntu"
+
+on:
+  push:
+    branches: [ test*, "*.*.*" ]
+jobs:
+  # job 1
+  test:
+    name: "test"
+    services:
+      redis:
+        image: redis:7.2
+        ports:
+          - 6379:6379
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      nacos:
+        image: nacos/nacos-server:v2.4.2
+        ports:
+          - 8848:8848
+        env:
+          MODE: standalone
+          SPRING_SECURITY_ENABLED: false
+        options: --health-cmd="curl -f http://localhost:8848/nacos" --health-interval=10s --health-timeout=5s --health-retries=3 --health-start-period=30s
+    runs-on: "${{ matrix.os }}-latest"
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        java: [ 8, 11, 17, 21 ]
+        os: [
+          ubuntu,
+        ]
+        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.1.18.RELEASE,
+          #2.0.9.RELEASE,
+        ]
+    steps:
+      # step 1
+      - name: "Checkout"
+        uses: actions/checkout@v3
+      # step 2
+      - name: "Use Python 3.x"
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+      # step 3
+      - name: "Set up Java JDK"
+        uses: actions/setup-java@v3.12.0
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+      # step 4
+      ## step 4.1: for Ubuntu and MacOS
+      - name: "Test with Maven on '${{ matrix.os }}' OS"
+        run: |
+          ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+
+  # job 2
+  test-springboot3x:
+    name: "test-springboot3.x"
+    services:
+      redis:
+        image: redis:7.2
+        ports:
+          - 6379:6379
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      nacos:
+        image: nacos/nacos-server:v2.4.2
+        ports:
+          - 8848:8848
+        env:
+          MODE: standalone
+          SPRING_SECURITY_ENABLED: false
+        options: --health-cmd="curl -f http://localhost:8848/nacos" --health-interval=10s --health-timeout=5s --health-retries=3 --health-start-period=30s
+    runs-on: "${{ matrix.os }}-latest"
+    strategy:
+      max-parallel: 3
+      fail-fast: false
+      matrix:
+        java: [ 17, 21 ]
+        os: [
+          ubuntu,
+        ]
+        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,
+        ]
+    steps:
+      # step 1
+      - name: "Checkout"
+        uses: actions/checkout@v3
+      # step 2
+      - name: "Use Python 3.x"
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+      # step 3
+      - name: "Set up Java JDK"
+        uses: actions/setup-java@v3.12.0
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+      # step 4
+      ## step 4.1: for Ubuntu and MacOS
+      - name: "Test with Maven on '${{ matrix.os }}' OS"
+        if: matrix.os != 'windows'
+        run: |
+          ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+      ## step 4.2: for Windows
+      - name: "Build with Maven on 'windows' OS (Skip tests)"
+        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 }} -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         -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.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 && \
+                       apt-get install -y python3 python3-pip python3-distutils && \
+                       apt-get install -y build-essential && \
+                       mvn -version && \
+                       mvn -T 4C clean install \
+                           -Dspring-boot.version=${{ matrix.springboot }} \
+                           -Prelease-seata \
+                           -DskipTests \
+                           -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,11 +9,11 @@ jobs:
     name: "test"
     runs-on: "${{ matrix.os }}-latest"
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         java: [ 8, 11, 17, 21 ]
         os: [
-          ubuntu,
           macos,
           windows, # Skip tests, because too many errors in unit-test.
         ]
@@ -69,11 +69,11 @@ jobs:
     name: "test-springboot3.x"
     runs-on: "${{ matrix.os }}-latest"
     strategy:
+      max-parallel: 3
       fail-fast: false
       matrix:
         java: [ 17, 21 ]
         os: [
-          ubuntu,
           macos,
           windows, # Skip tests, because too many errors in unit-test.
         ]
@@ -118,44 +118,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 }} -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         -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.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 && \
-                       apt-get install -y python3 python3-pip python3-distutils && \
-                       apt-get install -y build-essential && \
-                       mvn -version && \
-                       mvn -T 4C clean install \
-                           -Dspring-boot.version=${{ matrix.springboot }} \
-                           -Prelease-seata \
-                           -DskipTests \
-                           -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,9 @@ language: java
 sudo: false # faster builds
 
 jdk:
-  - openjdk11
   - openjdk8
+  - openjdk17
+  - openjdk21
 
 cache:
   directories:
@@ -28,10 +29,13 @@ install: true
 
 before_script:
   - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then
-      export IMAGE_NAME="openjdk:8-jre-slim";
+      export IMAGE_NAME="eclipse-temurin:8u422-b05-jre";
     fi
-  - if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then
-      export IMAGE_NAME="openjdk:11-jre-stretch";
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk17" ]; then
+      export IMAGE_NAME="eclipse-temurin:17.0.12_7-jre";
+    fi
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk21" ]; then
+      export IMAGE_NAME="eclipse-temurin:21.0.4_7-jre";
     fi
 
 script:

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Build Status](https://github.com/apache/incubator-seata/workflows/build/badge.svg?branch=develop)](https://github.com/apache/incubator-seata/actions)
 [![codecov](https://codecov.io/gh/apache/incubator-seata/graph/badge.svg?token=tbmHt2ZfxO)](https://codecov.io/gh/apache/incubator-seata)
 [![license](https://img.shields.io/github/license/apache/incubator-seata.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![maven](https://img.shields.io/maven-central/v/io.apache/incubator-seata-parent?versionSuffix=2.0.0)](https://search.maven.org/search?q=io.seata)
+[![maven](https://img.shields.io/maven-central/v/org.apache.seata/seata-all?versionSuffix=2.2.0)](https://central.sonatype.com/search?q=org.apache.seata%3Aseata-all)
 
 ## What is Seata?
 
@@ -82,24 +82,24 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 ## Maven dependency
 
-Depending on the scenario, choose one of the two dependencies: `io.seata:seata-all` or `io.seata:seata-spring-boot-starter`.
+Depending on the scenario, choose one of the two dependencies: `org.apache.seata:seata-all` or `org.apache.seata:seata-spring-boot-starter`.
 ```xml
 <properties>
-  <seata.version>2.0.0</seata.version>
+  <seata.version>2.2.0</seata.version>
 </properties>
 
 <dependencies>
 <!--dependencies for non-SpringBoot application framework-->
   <dependency>
-    <groupId>io.seata</groupId>
+    <groupId>org.apache.seata</groupId>
     <artifactId>seata-all</artifactId>
     <version>${seata.version}</version>
   </dependency>
 
 <!--If your project base on `Spring Boot`, you can directly use the following dependencies-->
 <!--Notice: `seata-spring-boot-starter` has already included `seata-all` dependency-->
   <dependency>
-    <groupId>io.seata</groupId>
+    <groupId>org.apache.seata</groupId>
     <artifactId>seata-spring-boot-starter</artifactId>
     <version>${seata.version}</version>
   </dependency>
@@ -134,15 +134,16 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
   * dev@seata.apache.org , for dev/user discussion. [subscribe](mailto:dev-subscribe@seata.apache.org), [unsubscribe](mailto:dev-unsubscribe@seata.apache.org), [archive](https://lists.apache.org/list.html?dev@seata.apache.org)
 * Online chat: 
 
-<img src="https://img.alicdn.com/imgextra/i2/O1CN01nQG77T1VNcpPDOMVi_!!6000000002641-0-tps-1566-424.jpg"  height="200" width="630">
-
+|                                                       Dingtalk group                                                        |                                                   Wechat official account                                                    |                                                       QQ group                                                        |                                                  Wechat assistant                                                   |
+|:---------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------:|
+| <img src="https://seata.apache.org/zh-cn/assets/images/dingtalk-group-67f42c9466fb2268b6927bb16b549d6c.jpg"  width="150" /> | <img src="https://seata.apache.org/zh-cn/assets/images/wechat-official-467d10305f5449e6b2096e65d23a9d02.jpg"  width="150" /> | <img src="https://seata.apache.org/zh-cn/assets/images/qq-group-8d8a89699cdb9ba8818364069475ba96.jpg"  width="150" /> | <img src="https://seata.apache.org/zh-cn/assets/images/wechat-f8a87a96973942b826e32d1aed9bc8d9.jpg"  width="150" /> |
 
 ## Seata ecosystem
 
 * [Seata Website](https://github.com/apache/incubator-seata.github.io) - Seata official website
 * [Seata GoLang](https://github.com/apache/incubator-seata-go) - Seata GoLang client and server
 * [Seata Samples](https://github.com/apache/incubator-seata-samples) - Samples for Seata
-* [Seata GoLang Simples](https://github.com/apache/incubator-seata-go-samples) - Samples for Seata GoLang
+* [Seata GoLang Samples](https://github.com/apache/incubator-seata-go-samples) - Samples for Seata GoLang
 * [Seata K8s](https://github.com/apache/incubator-seata-k8s) - Seata integration with k8s
 * [Seata CLI](https://github.com/apache/incubator-seata-ctl) - CLI tool for Seata