Merge branch 'main' into copilot/fix-code-scanning-alerts-120

* Initial plan

* Fix template injection in e2e-versions.yml (zizmor alert #122)

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

.github/workflows/e2e-versions.yml

@@ -757,16 +757,16 @@ jobs:
         shell: pwsh
       - name: Verify Java 21 outputs are set
         env:
-          JAVA21_PATH: ${{ steps.setup-java-21.outputs.path }}
-          JAVA21_VERSION: ${{ steps.setup-java-21.outputs.version }}
+          JAVA_21_PATH: ${{ steps.setup-java-21.outputs.path }}
+          JAVA_21_VERSION: ${{ steps.setup-java-21.outputs.version }}
         run: |
-          echo "Java 21 path=$JAVA21_PATH"
-          echo "Java 21 version=$JAVA21_VERSION"
-          if [ -z "$JAVA21_PATH" ]; then
+          echo "Java 21 path=$JAVA_21_PATH"
+          echo "Java 21 version=$JAVA_21_VERSION"
+          if [ -z "$JAVA_21_PATH" ]; then
             echo "Java 21 path output should be set"
             exit 1
           fi
-          if [ -z "$JAVA21_VERSION" ]; then
+          if [ -z "$JAVA_21_VERSION" ]; then
             echo "Java 21 version output should be set"
             exit 1
           fi