From 6c4609a836bde9ef4c1ef38b8f36ada94ce1625f Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 10 Apr 2026 06:59:26 +0200
Subject: [PATCH] ci(struts6): adjusts workflows to use the new branch

---
 .asf.yaml                    | 11 ++++++++++-
 .github/dependabot.yml       |  2 +-
 .github/workflows/codeql.yml |  1 +
 .github/workflows/maven.yml  |  1 +
 Jenkinsfile                  |  6 +++---
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index db87952530..0cc9baea55 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -23,7 +23,16 @@ github:
         # it does not work because our github teams are private/secret, see INFRA-25666
         require_code_owner_reviews: false
         required_approving_review_count: 0
-    release/*:
+    support/struts-6-x-x:
+      # contexts are the names of checks that must pass.
+      required_status_checks:
+        contexts:
+          - "Build and Test (JDK 8)"
+      required_pull_request_reviews:
+        # it does not work because our github teams are private/secret, see INFRA-25666
+        require_code_owner_reviews: false
+        required_approving_review_count: 0
+    support/release-6-*:
       # contexts are the names of checks that must pass.
       required_status_checks:
         contexts:
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cedde4e8bc..70ada4ebf5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,7 +15,7 @@ updates:
       interval: "weekly"
     cooldown:
       default: 4
-    target-branch: "release/struts-6-8-x"
+    target-branch: "support/struts-6-x-x"
     ignore:
       - dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
       - dependency-name: "com.github.ben-manes.caffeine:caffeine"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index ee2013bba2..0b9be00e28 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,6 +20,7 @@ on:
     branches:
       - 'main'
       - 'release/*'
+      - 'support/*'
   pull_request:
 
 permissions:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 886f62775d..e7968d80d6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,6 +21,7 @@ on:
     branches:
       - 'main'
       - 'release/*'
+      - 'support/*'
 
 permissions: read-all
 
diff --git a/Jenkinsfile b/Jenkinsfile
index d1d6c7b5c5..1fce32d7cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -105,7 +105,7 @@ pipeline {
           when {
             anyOf {
               branch 'main'
-              branch 'release/struts-6-8-x'
+              branch 'support/struts-6-x-x'
             }
           }
           steps {
@@ -119,7 +119,7 @@ pipeline {
           when {
             anyOf {
               branch 'main'
-              branch 'release/struts-6-8-x'
+              branch 'support/struts-6-x-x'
             }
           }
           steps {
@@ -132,7 +132,7 @@ pipeline {
           when {
             anyOf {
               branch 'main'
-              branch 'release/struts-6-8-x'
+              branch 'support/struts-6-x-x'
             }
           }
           steps {