root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '3.3.x' 

Closes gh-43160
This commit is contained in:
Moritz Halbritter 2024-11-14 14:48:01 +01:00
parent 5a7e632210 ec236be2bb
commit ad8ffdb59c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/documentation.adoc
View File

@ -25,7 +25,8 @@ You should always ensure that you are running a {url-github-wiki}/Supported-Vers
Depending on the version that you are upgrading to, you can find some additional tips here:
* *From 1.x:* xref:upgrading.adoc#upgrading.from-1x[Upgrading from 1.x]
* *From 1.x to 2.x:* xref:upgrading.adoc#upgrading.from-1x[Upgrading from 1.x]
* *From 2.x:* xref:upgrading.adoc#upgrading.from-2x[Upgrading from 2.x]
* *To a new feature release:* xref:upgrading.adoc#upgrading.to-feature[Upgrading to New Feature Release]
* *Spring Boot CLI:* xref:upgrading.adoc#upgrading.cli[Upgrading the Spring Boot CLI]

10
spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/upgrading.adoc
View File

@ -12,7 +12,15 @@ If you are more than one release behind, please make sure that you also review t
[[upgrading.from-1x]]
== Upgrading From 1.x
If you are upgrading from the `1.x` release of Spring Boot, check the {url-github-wiki}/Spring-Boot-2.0-Migration-Guide[migration guide] on the project wiki that provides detailed upgrade instructions.
If you are upgrading from the `1.x` release of Spring Boot, check the {url-github-wiki}/Spring-Boot-2.0-Migration-Guide[migration guide] on the project wiki that provides detailed upgrade instructions to upgrade to Spring Boot 2.x.
Check also the {url-github-wiki}[release notes] for a list of "`new and noteworthy`" features for each release.
[[upgrading.from-2x]]
== Upgrading From 2.x
If you are upgrading from the `2.x` release of Spring Boot, check the {url-github-wiki}/Spring-Boot-3.0-Migration-Guide[migration guide] on the project wiki that provides detailed upgrade instructions.
Check also the {url-github-wiki}[release notes] for a list of "`new and noteworthy`" features for each release.