Skip to content

Commit 8a21655

Browse files
diegomarquezpdiegomarquezp
authored
ci: disable 4.x branch (#3949)
* ci: disable 4.x branch - We will only keep unit tests in case of critical upgrades - Other testing is disabled - Updated docs to indicate no support for this branch - Dependency upgrades are now disabled * docs: add 7.x in compatibility matrix
1 parent 669b239 commit 8a21655

File tree

7 files changed

+6
-43
lines changed

7 files changed

+6
-43
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,40 +52,6 @@ updates:
5252
# Spring Native dependencies:
5353
# Will be superseded by Spring Boot 3 official native support
5454

55-
- package-ecosystem: maven
56-
directory: "/"
57-
schedule:
58-
interval: daily
59-
commit-message:
60-
# Prefix all commit messages with "deps: "
61-
prefix: "deps"
62-
open-pull-requests-limit: 10
63-
target-branch: "4.x"
64-
labels:
65-
- "4.x dependencies"
66-
ignore:
67-
# Ignore major version updates - these should be made manually
68-
- dependency-name: "*"
69-
update-types: [ "version-update:semver-major" ]
70-
# Ignore formatter dependency versions used in codegen modules, since they are fixed for Java 8 support
71-
- dependency-name: "com.coveo:fmt-maven-plugin"
72-
- dependency-name: "com.google.googlejavaformat:google-java-format"
73-
# Ignore dependencies corresponding to Spring Boot 3.2+, Spring Cloud 2023.x:
74-
# Spring Boot dependencies
75-
- dependency-name: "org.springframework.boot:spring-boot-*"
76-
versions: [">=3.2.0"]
77-
# Spring Cloud dependencies
78-
- dependency-name: "org.springframework.cloud:spring-cloud-*"
79-
versions: ["2023.x", "2024.x", "2025.x"]
80-
# Spring Shell dependencies
81-
- dependency-name: "org.springframework.shell:spring-shell-starter"
82-
versions: [">=3.2.0"]
83-
# Spring Cloud Config dependencies
84-
- dependency-name: "org.springframework.cloud:spring-cloud-config-dependencies"
85-
versions: [">=4.2.0"]
86-
- dependency-name: "org.springframework.cloud:spring-cloud-starter-bootstrap"
87-
versions: [">=4.2.0"]
88-
8955
- package-ecosystem: maven
9056
directory: "/"
9157
schedule:

‎.github/release-please.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ branches:
1010
handleGHRelease: true
1111
branch: 3.x
1212
extraFiles: ["README.adoc"]
13-
- releaseType: java-yoshi
14-
handleGHRelease: true
15-
branch: 4.x
16-
extraFiles: ["README.adoc"]
1713
- releaseType: java-yoshi
1814
handleGHRelease: true
1915
branch: 5.x

‎.github/sync-repo-settings.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ branchProtectionRules:
113113
- 'parallel-NativeTests (trace-sample)'
114114
- 'parallel-NativeTests (vision)'
115115
- 'parallel-NativeTests (vision-sample)'
116+
# 4.x is not supported but we keep the required checks in case of critical updates
116117
- pattern: 4.x
117118
isAdminEnforced: true
118119
requiredStatusCheckContexts:

‎.github/workflows/integrationTests.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
- main
77
- 6.x
88
- 5.x
9-
- 4.x
109
- 3.x
1110
pull_request:
1211
types: [opened, synchronize, reopened]

‎.github/workflows/renovate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
- name: Run Renovate
1717
uses: renovatebot/forking-renovate@main
1818
with:
19-
baseBranches: main,6.x,5.x,4.x,3.x
19+
baseBranches: main,6.x,5.x,3.x
2020
createPullRequests: true

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
| Version | Supported |
66
| ------- |--------------------|
77
| 5.x | :heavy_check_mark: |
8-
| 4.x | :heavy_check_mark: |
8+
| 4.x | :x: |
99
| 3.x | :heavy_check_mark: |
1010
| 2.x | :x: |
1111
| 1.x | :x: |

‎docs/src/main/asciidoc/getting-started.adoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ Spring Framework on Google Cloud has dependency and transitive dependencies on S
99
| Spring Framework on Google Cloud | Spring Cloud | Spring Boot | Spring Framework | Supported
1010

1111

12-
|6.x |https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2024.0-Release-Notes[2024.0.x] (Moorgate)|https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[3.4.x]|https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-6.2-Release-Notes[6.2.x]|Yes
12+
|7.x |https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2025.0-Release-Notes[2025.0.x] (Moorgate)|https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[3.4.x]|https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-6.2-Release-Notes[6.2.8+]|Yes
13+
|6.x |https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2024.0-Release-Notes[2024.0.x] (Moorgate)|https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[3.4.x]|https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-6.2-Release-Notes[6.2.0 - 6.2.7]|Yes
1314
|5.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2023.0-Release-Notes[2023.0.x] (Leyton) |https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.2-Release-Notes[3.2.x]*, https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.3-Release-Notes[3.3.x]
1415
| https://github.com/spring-projects/spring-framework/wiki/What%27s-New-in-Spring-Framework-6.x#whats-new-in-version-61[6.1.x]| Yes
15-
|4.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes[2022.0.x] (Kilburn) |https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Release-Notes[3.0.x], https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.1-Release-Notes[3.1.x]| https://github.com/spring-projects/spring-framework/wiki/What%27s-New-in-Spring-Framework-6.x#whats-new-in-version-60[6.x]| Yes
16+
|4.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes[2022.0.x] (Kilburn) |https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Release-Notes[3.0.x], https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.1-Release-Notes[3.1.x]| https://github.com/spring-projects/spring-framework/wiki/What%27s-New-in-Spring-Framework-6.x#whats-new-in-version-60[6.x]| No
1617
|3.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2021.0-Release-Notes[2021.0.x] (Jubilee) |2.6.x, 2.7.x | 5.3.x| Yes
1718
|2.x | https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2020.0-Release-Notes[2020.0.x] (Ilford) |2.4.x, 2.5.x|5.3.x| No
1819
|===

0 commit comments

Comments
 (0)