From 4882c3707b6357665bf1ffecbbd7f8fe7be5c020 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Fri, 20 Jun 2025 09:18:05 +0100
Subject: [PATCH] Update main to replace 4.0.x branch

---
 .github/workflows/build-and-deploy-snapshot.yml | 2 +-
 .github/workflows/ci.yml                        | 2 +-
 .github/workflows/release-milestone.yml         | 4 ++--
 .github/workflows/release.yml                   | 2 +-
 .github/workflows/run-system-tests.yml          | 2 +-
 .github/workflows/trigger-docs-build.yml        | 2 +-
 git/hooks/prepare-forward-merge                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
index b7e70af19ff..c5662389304 100644
--- a/.github/workflows/build-and-deploy-snapshot.yml
+++ b/.github/workflows/build-and-deploy-snapshot.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - 4.0.x
+      - 'main'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f437451ac9..40501dccc18 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - 4.0.x
+      - 'main'
 jobs:
   ci:
     name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
index c06f79df594..6594741c4ba 100644
--- a/.github/workflows/release-milestone.yml
+++ b/.github/workflows/release-milestone.yml
@@ -2,8 +2,8 @@ name: Release Milestone
 on:
   push:
     tags:
-      - v3.5.0-M[0-9]
-      - v3.5.0-RC[0-9]
+      - v4.0.0-M[0-9]
+      - v4.0.0-RC[0-9]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad9bf27d192..2f9db5921a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     tags:
-      - v3.5.[0-9]+
+      - v4.0.[0-9]+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml
index 77db6ed25d3..154fa471248 100644
--- a/.github/workflows/run-system-tests.yml
+++ b/.github/workflows/run-system-tests.yml
@@ -2,7 +2,7 @@ name: Run System Tests
 on:
   push:
     branches:
-      - 4.0.x
+      - 'main'
 jobs:
   run-system-tests:
     name: 'Java ${{ matrix.java.version}}'
diff --git a/.github/workflows/trigger-docs-build.yml b/.github/workflows/trigger-docs-build.yml
index e583dd88589..4b4e6058b85 100644
--- a/.github/workflows/trigger-docs-build.yml
+++ b/.github/workflows/trigger-docs-build.yml
@@ -1,7 +1,7 @@
 name: Trigger Docs Build
 on:
   push:
-    branches: main
+    branches: 'main'
     paths: [ 'antora/*' ]
   workflow_dispatch:
     inputs:
diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge
index f18265ab213..fbdb1e19448 100755
--- a/git/hooks/prepare-forward-merge
+++ b/git/hooks/prepare-forward-merge
@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$main_branch = "3.5.x"
+$main_branch = "4.0.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN