Merge branch 'apache:master' into master

.github/workflows/ci.yml

@@ -38,13 +38,15 @@ jobs:
             os: ubuntu-latest
           - java: 16
             os: ubuntu-latest
+          - java: 17
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     if: (github.repository == 'apache/shenyu')
     steps:
       - name: Support longpaths
         if: ${{ matrix.os == 'windows-latest'}}
         run: git config --system core.longpaths true
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
       - uses: dorny/paths-filter@v2
@@ -54,7 +56,7 @@ jobs:
           list-files: json
       - name: Cache Maven Repos
         if: steps.filter.outputs.changed == 'true'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -64,6 +66,8 @@ jobs:
         if: steps.filter.outputs.changed == 'true'
         with:
           java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: maven
       - name: Build with Maven
         if: steps.filter.outputs.changed == 'true'
         run: ./mvnw -B clean install -Prelease
@@ -75,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
       - name: Check License Header

.github/workflows/codeql-analysis.yml

@@ -38,16 +38,18 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 8
+          distribution: 'temurin'
+          cache: maven
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

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

@@ -55,16 +55,18 @@ jobs:
         run: echo ${{ steps.buildx.outputs.platforms }}
 
       - name: Cache Maven Repos
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         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

@@ -59,16 +59,18 @@ jobs:
         run: echo ${{ steps.buildx.outputs.platforms }}
 
       - name: Cache Maven Repos
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         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/e2e.yaml

@@ -150,7 +150,7 @@ jobs:
     if: ${{ needs.changes.outputs.e2e == 'true' }}
     strategy:
       matrix:
-        case: [ "shenyu-e2e-case-spring-cloud", "shenyu-e2e-case-apache-dubbo", "shenyu-e2e-case-sofa" ]
+        case: [ "shenyu-e2e-case-spring-cloud", "shenyu-e2e-case-apache-dubbo", "shenyu-e2e-case-sofa", "shenyu-e2e-case-motan", "shenyu-e2e-case-grpc"]
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/integrated-test-k8s-ingress.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     if: (github.repository == 'apache/shenyu')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -50,17 +50,19 @@ jobs:
 
       - name: Cache Maven Repos
         if: steps.filter.outputs.changed == 'true'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         if: steps.filter.outputs.changed == 'true'
         with:
           java-version: 8
+          distribution: 'temurin'
+          cache: maven
 
       - name: Build with Maven
         if: steps.filter.outputs.changed == 'true'

.github/workflows/integrated-test.yml

@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     if: (github.repository == 'apache/shenyu')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
       - uses: dorny/paths-filter@v2
@@ -52,16 +52,18 @@ jobs:
           list-files: json
       - name: Cache Maven Repos
         if: steps.filter.outputs.changed == 'true'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         if: steps.filter.outputs.changed == 'true'
         with:
           java-version: 8
+          distribution: 'temurin'
+          cache: maven
       - name: Build with Maven
         if: steps.filter.outputs.changed == 'true'
         run: ./mvnw -B clean install -Prelease,docker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true

.github/workflows/k8s-examples-http.yml

@@ -27,7 +27,7 @@ jobs:
     if: (github.repository == 'apache/shenyu')
     steps:
       -
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
       -
@@ -47,17 +47,19 @@ jobs:
       -
         name: Cache Maven Repos
         if: steps.filter.outputs.changed == 'true'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       -
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         if: steps.filter.outputs.changed == 'true'
         with:
           java-version: 8
+          distribution: 'temurin'
+          cache: maven
       -
         name: Build with Maven
         if: steps.filter.outputs.changed == 'true'

.gitignore

@@ -22,6 +22,7 @@ cobertura.ser
 # idea ignore
 .idea/
 !/.idea/icon.svg
+!/.idea/vcs.xml
 *.ipr
 *.iml
 *.iws

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,19 @@
+# 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
+#
+#   https://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.
+
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

LICENSE

@@ -215,4 +215,4 @@ Apache 2.0 licenses
 The following components are provided under the Apache License. See project link for details.
 The text of each license is the standard Apache 2.0 license.
 
-    Maven Wrapper(mvnw, mvnw.cmd files in root path), https://github.com/takari/maven-wrapper  Apache 2.0
+    Maven Wrapper(mvnw, mvnw.cmd files in root path), https://github.com/apache/maven-wrapper  Apache 2.0