Merge branch 'master' into master-4988

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Describe your PR here; eg. Fixes #issueNo -->
+<!-- Describe your PR here; e.g. Fixes #issueNo -->
 
 <!--
 Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.

.github/workflows/ci.yml

@@ -40,6 +40,14 @@ jobs:
             os: ubuntu-latest
           - java: 17
             os: ubuntu-latest
+          - java: 18
+            os: ubuntu-latest
+          - java: 19
+            os: ubuntu-latest
+          - java: 20
+            os: ubuntu-latest
+          - java: 21
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     if: (github.repository == 'apache/shenyu')
     steps:
@@ -54,9 +62,10 @@ jobs:
         with:
           filters: '.github/filters.yml'
           list-files: json
-      - name: Cache Maven Repos
+      - name: Restore ShenYu Maven Repos
         if: steps.filter.outputs.changed == 'true'
-        uses: actions/cache@v3
+        id: restore-maven-cache
+        uses: actions/cache/restore@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -68,9 +77,15 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Build with Maven
         if: steps.filter.outputs.changed == 'true'
-        run: ./mvnw -B clean install -Prelease
+        run: ./mvnw -B clean test -Prelease
       - uses: codecov/codecov-action@v1
         if: steps.filter.outputs.changed == 'true'
+      - name: Save ShenYu Maven Repos
+        if: steps.filter.outputs.changed == 'true' && steps.restore-maven-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
 
   check-license-header:
     name: check-license-header

.github/workflows/codeql-analysis.yml

@@ -46,10 +46,10 @@ jobs:
         with:
           java-version: 8
           distribution: 'temurin'
-          cache: maven
 
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
+      - name: Restore ShenYu Maven Repos
+        id: restore-maven-cache
+        uses: actions/cache/restore@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/docker-publish-dockerhub.yml

@@ -54,8 +54,9 @@ jobs:
       - name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
 
-      - name: Cache Maven Repos
-        uses: actions/cache@v3
+      - name: Restore ShenYu Maven Repos
+        id: restore-maven-cache
+        uses: actions/cache/restore@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -66,7 +67,6 @@ jobs:
         with:
           java-version: 8
           distribution: 'temurin'
-          cache: maven
 
       - name: Build with Maven
         run: ./mvnw -B clean -Prelease -Dmaven.javadoc.skip=true -B -Drat.skip=true -Djacoco.skip=true -DskipITs -DskipTests package

.github/workflows/docker-publish.yml

@@ -58,8 +58,9 @@ jobs:
       - name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
 
-      - name: Cache Maven Repos
-        uses: actions/cache@v3
+      - name: Restore ShenYu Maven Repos
+        id: restore-maven-cache
+        uses: actions/cache/restore@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -70,7 +71,6 @@ jobs:
         with:
           java-version: 8
           distribution: 'temurin'
-          cache: maven
 
       - name: Build with Maven
         run: ./mvnw -B clean -Prelease -Dmaven.javadoc.skip=true -B -Drat.skip=true -Djacoco.skip=true -DskipITs -DskipTests package