Merge branch 'apache-3.1' into 3.1.5-release

Author: AlbumenJ

.github/workflows/build-and-test-pr.yml

@@ -229,7 +229,7 @@ jobs:
     needs: [build-source, integration-test-prepare]
     name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 90
     env:
       JAVA_VER: 8
       TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt

.github/workflows/build-and-test-scheduled-3.1.yml

@@ -235,14 +235,14 @@ jobs:
     needs: [build-source, integration-test-prepare]
     name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 90
     env:
       JAVA_VER: ${{matrix.jdk}}
       TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
     strategy:
       fail-fast: false
       matrix:
-        jdk: [ 8, 11, 17, 19 ]
+        jdk: [ 8, 11 ]
         job_id: [1, 2, 3, 4, 5]
     steps:
       - uses: actions/checkout@v3
@@ -299,7 +299,7 @@ jobs:
       JAVA_VER: ${{matrix.jdk}}
     strategy:
       matrix:
-        jdk: [ 8, 11, 17, 19 ]
+        jdk: [ 8, 11 ]
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/build-and-test-scheduled-3.2.yml

@@ -235,7 +235,7 @@ jobs:
     needs: [build-source, integration-test-prepare]
     name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 90
     env:
       JAVA_VER: ${{matrix.jdk}}
       TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt

.github/workflows/release-test.yml

@@ -231,7 +231,7 @@ jobs:
     needs: [build-source, integration-test-prepare]
     name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 90
     env:
       JAVA_VER: ${{matrix.jdk}}
       TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt