Merge main to prod

.gitattributes

@@ -0,0 +1 @@
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/actions/docker-build/action.yml

@@ -14,7 +14,7 @@ runs:
   using: composite
   steps:
   - name: Build container image and push to Azure
-    uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+    uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
     with:
       file: ${{ inputs.DOCKER_FILE }}
       tags: ${{ inputs.DOCKER_REPO }}:latest

.github/aw/actions-lock.json

@@ -0,0 +1,9 @@
+{
+  "entries": {
+    "actions/github-script@v9.0.0": {
+      "repo": "actions/github-script",
+      "version": "v9.0.0",
+      "sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
+    }
+  }
+}

.github/dependabot.yml

@@ -1,60 +1,66 @@
-version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  # Maintain dependencies for GitHub composite Actions (/.github/actions)
-  # Waiting for supporting wildcards see https://github.com/dependabot/dependabot-core/issues/5137
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/azure-login"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/do-login"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/.github/actions/docker-build"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    groups:
-      graphql-kotlin:
-        patterns:
-          - "com.expediagroup:graphql-kotlin-*"
-      maven-core:
-        patterns:
-          - "org.apache.maven:maven-*"
-      jackson:
-        patterns:
-          - "com.fasterxml.jackson.*:jackson-*"
-      jetty:
-        patterns:
-          - "org.eclipse.jetty:*"
-      jwt:
-        patterns:
-          - "io.jsonwebtoken:jjwt-*"
-      logback:
-        patterns:
-          - "ch.qos.logback:*"
-      jakarta-apis:
-        patterns:
-          - "jakarta.*:*"
-      rest-assured:
-        patterns:
-          - "io.rest-assured:*"
-      quarkus-logging:
-        patterns:
-          - "io.quarkiverse.logging.logback:*"
-  - package-ecosystem: docker
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: docker
-    directory: "/deploy"
-    schedule:
-      interval: "daily"
+- directory: /
+  ignore:
+  - dependency-name: "github/gh-aw-actions/**" # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
+  package-ecosystem: github-actions
+  schedule:
+    interval: daily
+- directory: /.github/actions/azure-login
+  ignore:
+  - dependency-name: "github/gh-aw-actions/**" # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
+  package-ecosystem: github-actions
+  schedule:
+    interval: daily
+- directory: /.github/actions/do-login
+  ignore:
+  - dependency-name: "github/gh-aw-actions/**" # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
+  package-ecosystem: github-actions
+  schedule:
+    interval: daily
+- directory: /.github/actions/docker-build
+  ignore:
+  - dependency-name: "github/gh-aw-actions/**" # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
+  package-ecosystem: github-actions
+  schedule:
+    interval: daily
+- directory: /
+  groups:
+    graphql-kotlin:
+      patterns:
+      - com.expediagroup:graphql-kotlin-*
+    jackson:
+      patterns:
+      - com.fasterxml.jackson.*:jackson-*
+    jakarta-apis:
+      patterns:
+      - jakarta.*:*
+    jetty:
+      patterns:
+      - org.eclipse.jetty:*
+    jwt:
+      patterns:
+      - io.jsonwebtoken:jjwt-*
+    logback:
+      patterns:
+      - ch.qos.logback:*
+    maven-core:
+      patterns:
+      - org.apache.maven:maven-*
+    quarkus-logging:
+      patterns:
+      - io.quarkiverse.logging.logback:*
+    rest-assured:
+      patterns:
+      - io.rest-assured:*
+  package-ecosystem: maven
+  schedule:
+    interval: daily
+- directory: /
+  package-ecosystem: docker
+  schedule:
+    interval: daily
+- directory: /deploy
+  package-ecosystem: docker
+  schedule:
+    interval: daily
+version: 2

.github/workflows/ci.yml

@@ -30,11 +30,11 @@ jobs:
           adoptopenjdk) echo "ARGS=-Padoptopenjdk,-adoptium" >> $GITHUB_ENV ;;
         esac
 
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       with:
         persist-credentials: false
 
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+    - uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
       with:
         java-version: '21'
         distribution: 'temurin'

.github/workflows/codeql.yml

@@ -36,19 +36,19 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+      uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+    - uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
       with:
         java-version: '21'
         distribution: 'temurin'
@@ -59,6 +59,6 @@ jobs:
         ./mvnw --batch-mode clean install -Padoptium,-adoptopenjdk
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+      uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,14 @@
+# This is a templated file from https://github.com/adoptium/.eclipsefdn/tree/main/otterdog/blueprints/require_dependabot_auto_merge.yml
+name: Dependabot auto-merge
+on: pull_request_target
+
+permissions: read-all
+
+jobs:
+  dependabot:
+    permissions:
+      contents: write
+      pull-requests: write
+    uses: adoptium/.github/.github/workflows/dependabot-auto-merge.yml@main
+    with:
+      merge_method: merge

.github/workflows/deploy-adoptium.yml

@@ -14,7 +14,7 @@ jobs:
     if: startsWith(github.repository, 'adoptium/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Login to Azure
         uses: ./.github/actions/azure-login

.github/workflows/deploy-adoptopenjdk.yml

@@ -14,7 +14,7 @@ jobs:
     if: startsWith(github.repository, 'adoptium/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Login to Azure
         uses: ./.github/actions/azure-login