From d558c6adfa5815331f2891abcdfd209651bb6031 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 20 Jun 2025 09:11:17 +0100 Subject: [PATCH] Prepare the 3.5.x branch --- .github/workflows/build-and-deploy-snapshot.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/run-system-tests.yml | 2 +- .github/workflows/trigger-docs-build.yml | 2 +- README.adoc | 2 +- gradle.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 9288e202538..793465fd960 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: - - main + - '3.5.x' concurrency: group: ${{ github.workflow }}-${{ github.ref }} jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 230189a14b0..e6a86cac425 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: branches: - - main + - '3.5.x' jobs: ci: name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}' diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml index 26d8c2ddafd..387de5c7065 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: - - main + - '3.5.x' 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..9779492cdbb 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: '3.5.x' paths: [ 'antora/*' ] workflow_dispatch: inputs: diff --git a/README.adoc b/README.adoc index d4966c41042..135b1668088 100755 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= Spring Boot image:https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml/badge.svg?branch=main["Build Status", link="https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3Amain"] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?&search.rootProjectNames=Spring%20Boot%20Build&search.rootProjectNames=spring-boot-build"] += Spring Boot image:https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3A3.5.x["Build Status", link="https://github.com/spring-projects/spring-boot/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3A3.5.x"] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?&search.rootProjectNames=Spring%20Boot%20Build&search.rootProjectNames=spring-boot-build"] :docs: https://docs.spring.io/spring-boot :github: https://github.com/spring-projects/spring-boot diff --git a/gradle.properties b/gradle.properties index d3b598e09a6..090daaa00f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=3.5.4-SNAPSHOT -latestVersion=true +latestVersion=false spring.build-type=oss org.gradle.caching=true