Merge remote-tracking branch 'origin/V5' into V6

Author: sanluan

.github/workflows/docker-image.yml

@@ -5,9 +5,9 @@ on:
   push:
     tags:
       - V*
-    branches: [ "V5", "V4.0" ]
+    branches: [ "V6", "V5", "V4.0" ]
   pull_request:
-    branches: [ "V5", "V4.0" ]
+    branches: [ "V6", "V5", "V4.0" ]
 
 jobs:
   build:
@@ -16,10 +16,10 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
 

.github/workflows/gradle-build.yml

@@ -9,9 +9,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "V5", "V4.0" ]
+    branches: [ "V6", "V5", "V4.0" ]
   pull_request:
-    branches: [ "V5", "V4.0" ]
+    branches: [ "V6", "V5", "V4.0" ]
 
 jobs:
   build:
@@ -22,10 +22,10 @@ jobs:
     - name: Checkout sources
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: gradle
 

.github/workflows/maven-build.yml

@@ -10,9 +10,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ "V5", "V4.0" ]
+    branches: [ "V6", "V5", "V4.0" ]
   pull_request:
-    branches: [ "V5", "V4.0" ]
+    branches: [ "V6", "V4.0" ]
 
 jobs:
   build:
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven