mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.3.x' into 2.4.x
Closes gh-26256
This commit is contained in:
commit
a1138efc5f
@ -26,7 +26,7 @@
|
||||
:spring-boot-code: https://github.com/{github-repo}/tree/{github-tag}
|
||||
:spring-boot-api: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/api
|
||||
:spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference
|
||||
:spring-boot-master-code: https://github.com/{github-repo}/tree/master
|
||||
:spring-boot-latest-code: https://github.com/{github-repo}/tree/main
|
||||
:spring-boot-current-docs: https://docs.spring.io/spring-boot/docs/current/reference/
|
||||
:spring-boot-actuator-restapi-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/actuator-api/htmlsingle
|
||||
:spring-boot-actuator-restapi-pdfdocs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/actuator-api/pdf/spring-boot-actuator-web-api.pdf
|
||||
|
@ -217,7 +217,7 @@ The most common deployment workflow for Heroku deployments is to `git push` the
|
||||
|
||||
[indent=0,subs="verbatim,quotes,attributes"]
|
||||
----
|
||||
$ git push heroku master
|
||||
$ git push heroku main
|
||||
|
||||
Initializing repository, *done*.
|
||||
Counting objects: 95, *done*.
|
||||
@ -255,7 +255,7 @@ The most common deployment workflow for Heroku deployments is to `git push` the
|
||||
https://agile-sierra-1405.herokuapp.com/ *deployed to Heroku*
|
||||
|
||||
To git@heroku.com:agile-sierra-1405.git
|
||||
* [new branch] master -> master
|
||||
* [new branch] main -> main
|
||||
----
|
||||
|
||||
Your application should now be up and running on Heroku.
|
||||
|
@ -1216,7 +1216,7 @@ If you add your own, you have to be aware of the order and in which position you
|
||||
This is a useful member of the view resolver chain and picks up any beans with the same name as the `View` being resolved.
|
||||
It should not be necessary to override or replace it.
|
||||
* A `ContentNegotiatingViewResolver` named '`viewResolver`' is added only if there *are* actually beans of type `View` present.
|
||||
This is a '`master`' resolver, delegating to all the others and attempting to find a match to the '`Accept`' HTTP header sent by the client.
|
||||
This is a composite resolver, delegating to all the others and attempting to find a match to the '`Accept`' HTTP header sent by the client.
|
||||
There is a useful https://spring.io/blog/2013/06/03/content-negotiation-using-views[blog about `ContentNegotiatingViewResolver`] that you might like to study to learn more, and you might also look at the source code for detail.
|
||||
You can switch off the auto-configured `ContentNegotiatingViewResolver` by defining a bean named '`viewResolver`'.
|
||||
* If you use Thymeleaf, you also have a `ThymeleafViewResolver` named '`thymeleafViewResolver`'.
|
||||
|
@ -155,7 +155,7 @@ include::starters/technical-starters.adoc[]
|
||||
|
||||
To learn how to swap technical facets, please see the how-to documentation for <<howto.adoc#howto-use-another-web-server, swapping web server>> and <<howto.adoc#howto-configure-log4j-for-logging, logging system>>.
|
||||
|
||||
TIP: For a list of additional community contributed starters, see the {spring-boot-master-code}/spring-boot-project/spring-boot-starters/README.adoc[README file] in the `spring-boot-starters` module on GitHub.
|
||||
TIP: For a list of additional community contributed starters, see the {spring-boot-latest-code}/spring-boot-project/spring-boot-starters/README.adoc[README file] in the `spring-boot-starters` module on GitHub.
|
||||
|
||||
|
||||
|
||||
|
@ -10,7 +10,7 @@ Andy Wilkinson, Scott Frederick
|
||||
:docinfo: shared,private
|
||||
|
||||
:dependency-management-plugin: https://github.com/spring-gradle-plugins/dependency-management-plugin
|
||||
:dependency-management-plugin-documentation: {dependency-management-plugin}/blob/master/README.md
|
||||
:dependency-management-plugin-documentation: https://docs.spring.io/dependency-management-plugin/docs/current/reference/html/
|
||||
:gradle-userguide: https://docs.gradle.org/current/userguide
|
||||
:gradle-dsl: https://docs.gradle.org/current/dsl
|
||||
:gradle-api: https://docs.gradle.org/current/javadoc
|
||||
|
Loading…
Reference in New Issue
Block a user