Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

Author: OlgaMaciaszek

.github/workflows/maven.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           report_paths: '**/surefire-reports/TEST-*.xml'
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: surefire-reports
           path: '**/surefire-reports/*'