Commit Graph

2318 Commits (80c79cea911a6989cb488831653cbea7369dbb0d)

Author SHA1 Message Date
Andy Wilkinson bb26b7bdf5 Polish
Closes gh-27431
3 years ago
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc
See gh-27357
3 years ago
Andy Wilkinson d9e525c326 Merge branch '2.4.x' into 2.5.x
Closes gh-27301
3 years ago
Andy Wilkinson 2354dd5ccb Include Jetty metrics in list of supported metrics
Closes gh-27299
3 years ago
Madhura Bhave c6acce569f Merge branch '2.4.x' into 2.5.x
See gh-27139
3 years ago
Madhura Bhave 877f618a69 Clarify that HATEOAS can be used with Webflux without starter
Closes gh-26897
3 years ago
Madhura Bhave 503d50f39e Merge branch '2.4.x' into 2.5.x
Closes gh-27139
3 years ago
Madhura Bhave 6c4273b5c9 Document spring hateoas is spring mvc specific
Closes gh-26897
3 years ago
Nurlan Tembayev e57970393c Remove unnecessary unit for spring.datasource.tomcat.max-active
See gh-27103
3 years ago
biergit 79638a8f63 Fix anchor rewrites containing a question mark
See gh-27107
3 years ago
Cèsar Ordiñana 0c38449851 Fix typo in section title
See gh-27102
3 years ago
Stephane Nicoll d079db1dce Polish
See gh-26978
3 years ago
Stephane Nicoll d4fa46f1b9 Polish startup endpoint description in reference doc
Closes gh-26978
3 years ago
Phillip Webb fd83158fa5 Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb af37f59136 Merge branch '2.4.x' into 2.5.x
Closes gh-27056
3 years ago
Andy Wilkinson 051638631b Merge branch '2.4.x' into 2.5.x
Closes gh-27024
3 years ago
Andy Wilkinson ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration"
See gh-26937
3 years ago
Yanming Zhou a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration
See gh-26937
3 years ago
Yanming Zhou 12a6e4c231 Add missing space for asciidoc ordered list
See gh-26955
3 years ago
Phillip Webb 5c65b1bcde Fix asciidoctor anchor references
See gh-26939
3 years ago
Phillip Webb c3b873c11d Merge branch '2.4.x' into 2.5.x
Closes gh-26939
3 years ago
Phillip Webb b5c92d5174 Allow indirect standard profile-specific imports
Effectively revert commit d1b256a169 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
3 years ago
Stephane Nicoll 96029dbd8a Polish "Add Azure info to the cloud deployment docs"
See gh-26910
3 years ago
Andy Clement 8321faaf16 Add Azure info to the cloud deployment docs
See gh-26910
3 years ago
Madhura Bhave aa873d3a22 Reorder documentation overview section
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
3 years ago
Andy Wilkinson 5f26fd9ccb Merge branch '2.4.x' into 2.5.x
Closes gh-26891
3 years ago
Andy Wilkinson f6b7730dac Use Asciidoctor's revision line to provide document's version
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
3 years ago
Madhura Bhave 2e2d1fe8d3 Merge branch '2.4.x' into main 3 years ago
Madhura Bhave e3042b38f5 Merge branch '2.3.x' into 2.4.x 3 years ago
Madhura Bhave 63806d5bac Remove duplicate copyright notice from docs 3 years ago
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
3 years ago
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
3 years ago
Phillip Webb f798f26596 Merge branch '2.4.x' 3 years ago
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization
Closes gh-26682
3 years ago
Phillip Webb abd926788f Merge branch '2.4.x'
Closes gh-26782
3 years ago
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config'
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
3 years ago
Madhura Bhave 554cf9d7c7 Merge branch '2.4.x' into main
Closes gh-26741
4 years ago
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
4 years ago
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
4 years ago
Stephane Nicoll 1f95989e85 Merge branch '2.4.x'
Closes gh-26735
4 years ago
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x
Closes gh-26734
4 years ago
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis
Closes gh-26733
4 years ago
Madhura Bhave 54c3194164 Merge branch '2.4.x' into main
Closes gh-26701
4 years ago
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x
Closes gh-26700
4 years ago
Madhura Bhave f55e4c08f5 Add note about Kubernetes termination grace period
Closes gh-26469
4 years ago
Stephane Nicoll 454d72d9b2 Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Stephane Nicoll e5ee1eb86f Merge branch '2.4.x'
See gh-26654
4 years ago
Stephane Nicoll 130261f0df Merge branch '2.3.x' into 2.4.x
See gh-26653
4 years ago
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Stephane Nicoll f3d4fdb9c4 Merge branch '2.4.x'
Closes gh-26655
4 years ago