Browse Source

Partially revert forward merge of "Branch for 7.0.x maintenance"

pull/36475/head
Sam Brannen 3 days ago
parent
commit
fadbd0fa31
  1. 2
      .github/workflows/build-and-deploy-snapshot.yml
  2. 2
      framework-docs/antora.yml

2
.github/workflows/build-and-deploy-snapshot.yml

@ -2,7 +2,7 @@ name: Build and Deploy Snapshot @@ -2,7 +2,7 @@ name: Build and Deploy Snapshot
on:
push:
branches:
- 7.0.x
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
jobs:

2
framework-docs/antora.yml

@ -31,7 +31,7 @@ asciidoc: @@ -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

Loading…
Cancel
Save