Merge branch '4.1.x' into 4.2.x

Author: ryanjbaxter

.github/workflows/maven.yml

@@ -5,24 +5,24 @@ name: Build
 
 on:
   push:
-    branches: [ main, 3.1.x ]
+    branches: [ main, 4.2.x, 4.1.x, 4.0.x, 3.1.x ]
   pull_request:
-    branches: [ main, 3.1.x ]
+    branches: [ main, 4.2.x, 4.1.x, 4.0.x, 3.1.x ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -31,7 +31,7 @@ jobs:
       - name: Build with Maven
         run: ./mvnw clean install -B -U -Pspring -Dmaven.test.redirectTestOutputToFile=true
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v2
+        uses: mikepenz/action-junit-report@v5
         if: always() # always run even if the previous step fails
         with:
-          report_paths: '**/surefire-reports/TEST-*.xml'
+          report_paths: '**/surefire-reports/TEST-*.xml'