From be1bf91ce80c1ef2de860855878ef9c782d80925 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Fri, 13 Mar 2026 10:22:01 +0100 Subject: [PATCH] Branch for 7.0.x maintenance --- .github/workflows/build-and-deploy-snapshot.yml | 2 +- .github/workflows/update-antora-ui-spring.yml | 2 +- framework-docs/antora.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 467beedc650..eb469084a43 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: - - main + - 7.0.x concurrency: group: ${{ github.workflow }}-${{ github.ref }} jobs: diff --git a/.github/workflows/update-antora-ui-spring.yml b/.github/workflows/update-antora-ui-spring.yml index 5d391213a4d..5c8f411286c 100644 --- a/.github/workflows/update-antora-ui-spring.yml +++ b/.github/workflows/update-antora-ui-spring.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - branch: [ '6.2.x', 'main' ] + branch: [ '6.2.x', '7.0.x', 'main' ] steps: - uses: spring-io/spring-doc-actions/update-antora-spring-ui@5a57bcc6a0da2a1474136cf29571b277850432bc name: Update diff --git a/framework-docs/antora.yml b/framework-docs/antora.yml index c8c78a50db3..cb1c780c45b 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/main' + spring-framework-code: '{spring-framework-github}/tree/7.0.x' spring-framework-issues: '{spring-framework-github}/issues' spring-framework-wiki: '{spring-framework-github}/wiki' # Docs