From fadbd0fa3199bd84cc4eeb34ff710d18117ede35 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Sun, 15 Mar 2026 14:45:09 +0100
Subject: [PATCH] Partially revert forward merge of "Branch for 7.0.x
 maintenance"

---
 .github/workflows/build-and-deploy-snapshot.yml | 2 +-
 framework-docs/antora.yml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
index 6252bc2493f..883abb17f98 100644
--- a/.github/workflows/build-and-deploy-snapshot.yml
+++ b/.github/workflows/build-and-deploy-snapshot.yml
@@ -2,7 +2,7 @@ name: Build and Deploy Snapshot
 on:
   push:
     branches:
-      - 7.0.x
+      - main
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
diff --git a/framework-docs/antora.yml b/framework-docs/antora.yml
index cb1c780c45b..c8c78a50db3 100644
--- a/framework-docs/antora.yml
+++ b/framework-docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
     spring-org: 'spring-projects'
     spring-github-org: "https://github.com/{spring-org}"
     spring-framework-github: "https://github.com/{spring-org}/spring-framework"
-    spring-framework-code: '{spring-framework-github}/tree/7.0.x'
+    spring-framework-code: '{spring-framework-github}/tree/main'
     spring-framework-issues: '{spring-framework-github}/issues'
     spring-framework-wiki: '{spring-framework-github}/wiki'
     # Docs