Merge branch 'refs/heads/3.3' into feat/refactor_dir

# Conflicts: # dubbo-plugin/pom.xml # pom.xml
CrazyHZM · Nov 15, 2024 · 0302682 · 0302682
2 parents 813c3c4 + 6509b4a
commit 0302682
Show file tree

Hide file tree

Showing 88 changed files with 3,020 additions and 758 deletions.
diff --git a/.artifacts b/.artifacts
@@ -35,10 +35,8 @@ dubbo-configcenter-apollo
 dubbo-configcenter-nacos
 dubbo-configcenter-zookeeper
 dubbo-core-spi
-dubbo-dependencies
 dubbo-dependencies-all
 dubbo-dependencies-bom
-dubbo-dependencies-zookeeper-curator5
 dubbo-distribution
 dubbo-filter-cache
 dubbo-filter-validation
@@ -75,6 +73,7 @@ dubbo-remoting
 dubbo-remoting-api
 dubbo-remoting-http12
 dubbo-remoting-http3
+dubbo-remoting-websocket
 dubbo-remoting-netty
 dubbo-remoting-netty4
 dubbo-remoting-zookeeper-curator5
@@ -105,7 +104,6 @@ dubbo-spring-boot-starter
 dubbo-spring-boot-starters
 dubbo-spring-boot-interceptor
 dubbo-nacos-spring-boot-starter
-dubbo-zookeeper-spring-boot-starter
 dubbo-zookeeper-curator5-spring-boot-starter
 dubbo-sentinel-spring-boot-starter
 dubbo-seata-spring-boot-starter
@@ -116,3 +114,4 @@ dubbo-plugin-loom
 dubbo-rest-jaxrs
 dubbo-rest-spring
 dubbo-triple-servlet
+dubbo-triple-websocket
diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml
@@ -78,13 +78,13 @@ jobs:
     needs: check-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Check License"
         uses: apache/skywalking-eyes@e1a02359b239bd28de3f6d35fdc870250fa513d5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Set up JDK 21"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 21
@@ -107,11 +107,11 @@ jobs:
       version: ${{ steps.dubbo-version.outputs.version }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: dubbo
       - name: "Set up JDK"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 21
@@ -155,15 +155,15 @@ jobs:
           shopt -s globstar
           zip ${{ github.workspace }}/class.zip **/target/classes/* -r
       - name: "Upload class result"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "class-file"
           path: ${{ github.workspace }}/class.zip
       - name: "Pack checkstyle file if failure"
         if: failure()
         run: zip ${{ github.workspace }}/checkstyle.zip *checkstyle* -r
       - name: "Upload checkstyle file if failure"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: "checkstyle-file"
@@ -221,11 +221,11 @@ jobs:
       ZOOKEEPER_VERSION: 3.7.2
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: "Set up JDK ${{ matrix.jdk }}"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 21
@@ -256,7 +256,7 @@ jobs:
         if: failure()
         run: cat test_errors.log
       - name: "Upload coverage result"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-result
           path: "**/target/site/**/jacoco.xml"
@@ -267,14 +267,14 @@ jobs:
     env:
       JOB_COUNT: 3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-samples'
           ref: master
       - name: "Prepare test list"
         run: bash ./test/scripts/prepare-test.sh
       - name: "Upload test list"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: samples-test-list
           path: test/jobs
@@ -289,9 +289,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        job_id: [1, 2, 3]
+        job_id: [1,2,3]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-samples'
           ref: master
@@ -314,12 +314,12 @@ jobs:
             ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
             ${{ runner.os }}-dubbo-snapshot-
       - name: "Download test list"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: samples-test-list
           path: test/jobs/
       - name: "Set up JDK 8"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 8
@@ -335,9 +335,9 @@ jobs:
       - name: "merge jacoco result"
         run: cd test/dubbo-test-jacoco-merger && mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoMerge" -Dexec.args="${{github.workspace}}"
       - name: "Upload jacoco"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: samples-jacoco-result
+          name: samples-jacoco-result-${{matrix.job_id}}
           path: target/jacoco*.exec
       - name: "Upload test result"
         if: always()
@@ -352,7 +352,7 @@ jobs:
     env:
       JAVA_VER: 8
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-samples'
           ref: master
@@ -370,14 +370,14 @@ jobs:
     env:
       JOB_COUNT: 3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-integration-cases'
           ref: main
       - name: "Prepare test list"
         run: bash ./test/scripts/prepare-test.sh
       - name: "Upload test list"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-list
           path: test/jobs
@@ -392,9 +392,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        job_id: [1, 2, 3]
+        job_id: [1,2,3]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-integration-cases'
           ref: main
@@ -417,12 +417,12 @@ jobs:
             ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
             ${{ runner.os }}-dubbo-snapshot-
       - name: "Download test list"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: test-list
           path: test/jobs/
       - name: "Set up JDK 8"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 8
@@ -438,9 +438,9 @@ jobs:
       - name: "merge jacoco result"
         run: cd test/dubbo-test-jacoco-merger && mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoMerge" -Dexec.args="${{github.workspace}}"
       - name: "Upload jacoco"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: jacoco-result
+          name: jacoco-result-${{matrix.job_id}}
           path: target/jacoco*.exec
       - name: "Upload test result"
         if: always()
@@ -455,7 +455,7 @@ jobs:
     env:
       JAVA_VER: 8
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-integration-cases'
           ref: main
@@ -471,73 +471,82 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-format, integration-test-result, samples-test-result, unit-test]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "./dubbo"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-samples'
           path: "./dubbo-samples"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-integration-cases'
           path: "./dubbo-integration-cases"
       - name: "Set up JDK 21"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 21
       - name: "Restore class result"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: "class-file"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           path: ${{ github.workspace }}
       - name: "Unpack class result"
         run: |
           cd ${{ github.workspace }}/dubbo
           unzip -o ${{ github.workspace }}/class.zip
-      - name: "Restore jacoco exec"
-        uses: actions/download-artifact@v3
+      - name: "Restore samples jacoco exec"
+        uses: actions/download-artifact@v4
         with:
-          name: samples-jacoco-result
+          pattern: samples-jacoco-result-*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           path: dubbo-samples/target/
-      - name: "Restore integration jacoco exec"
-        uses: actions/download-artifact@v3
+      - name: "Restore integration test jacoco exec"
+        uses: actions/download-artifact@v4
         with:
-          name: jacoco-result
+          pattern: jacoco-result-*
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           path: dubbo-integration-cases/target/
-      - name: "Merge jacoco result"
+      - name: "Merge samples jacoco result"
         run: |
           cd ${{ github.workspace }}/dubbo-samples/test/dubbo-test-jacoco-merger
           mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoReport" -Dexec.args="${{github.workspace}}/dubbo-samples ${{github.workspace}}/dubbo"
-      - name: "Merge samples jacoco result"
+      - name: "Merge integration test jacoco result"
         run: |
           cd ${{ github.workspace }}/dubbo-integration-cases/test/dubbo-test-jacoco-merger
           mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoReport" -Dexec.args="${{github.workspace}}/dubbo-integration-cases ${{github.workspace}}/dubbo"
       - name: "Restore coverage result"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: coverage-result
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           path: dubbo/
       - name: "Upload coverage to Codecov"
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          version: v0.6.0
           verbose: true
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
 
   error-code-inspecting:
     needs: check-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "./dubbo"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'apache/dubbo-test-tools'
           ref: main
           path: "./dubbo-test-tools"
       - name: "Set up JDK 21"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 21
@@ -563,7 +572,7 @@ jobs:
       - name: "Upload error code inspection result"
         # always() should not be used here, since we don't need to handle the 'canceled' situation.
         if: ${{ success() || failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "error-inspection-result"
           path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt
@@ -572,7 +581,7 @@ jobs:
     needs: check-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "./dubbo"
       - name: "Setup GraalVM environment"