Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15

# Conflicts:
#	core/src/main/java/org/apache/struts2/components/UIBean.java
#	plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java
#	pom.xml

.github/workflows/codeql.yml

@@ -52,12 +52,12 @@ jobs:
         java-version: 17
         cache: 'maven'
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.26.6
+      uses: github/codeql-action/init@v3.26.12
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3.26.6
+      uses: github/codeql-action/autobuild@v3.26.12
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.26.6
+      uses: github/codeql-action/analyze@v3.26.12
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecards-analysis.yaml

@@ -58,13 +58,13 @@ jobs:
           publish_results: true
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874    # 4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882    # 4.4.3
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@821ab42c90a42d1d5cd3241930dff56a7c7dcfb2    # 2.22.11
+        uses: github/codeql-action/upload-sarif@ea2cd92c21b192add69983116b8b3222b09da33b    # 2.22.11
         with:
           sarif_file: results.sarif