Commit Graph

2291 Commits (9e46061aa683b47d3fadc0ee809d83764240fe22)

Author SHA1 Message Date
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
4 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
4 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
Stephane Nicoll fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation"
See gh-26421
4 years ago
Lovekesh Garg 944ba34556 Clarify Kotlin version requirements in documentation
See gh-26421
4 years ago
Oliver B. Fischer 11af8a816c Add link to Maven Git Commit Id Plugin
See gh-26635
4 years ago
Phillip Webb ab958d2394 Include io.spring.asciidoctor.backends group
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
4 years ago
Phillip Webb 8a3f835ffe Set Asciidoctor attribute-missing to warn
Closes gh-26590
4 years ago
weixsun d2bdcddb5f Fix outdated defaults for Info endpoint
See gh-26591
4 years ago
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
4 years ago
Phillip Webb 86a5c90d20 Simplify anchor-rewrite.properties 4 years ago
Phillip Webb e08d4f1fe6 Move "Use Jedis Instead of Lettuce" How-to
See gh-26262
4 years ago
Phillip Webb 499a29c415 Move "Testcontainers" How-to
See gh-26262
4 years ago
Phillip Webb 72d50ed2f8 Move "Testing With Spring Security" How-to
See gh-26262
4 years ago
Phillip Webb 5f7e3d3952 Polish 4 years ago
Andy Wilkinson 88b383c6bb Polish "Update docs and internal dep mgmt following Spock 2.0's release"
See gh-26586
4 years ago
dreis2211 5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release
See gh-26586
4 years ago
Andy Wilkinson 4bf5ff8a68 Merge branch '2.4.x'
Closes gh-26526
4 years ago
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x
Closes gh-26525
4 years ago
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies"
See gh-25944
4 years ago
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
4 years ago
Andy Wilkinson 05a64ecb2c Merge branch '2.4.x'
Closes gh-26522
4 years ago
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x
Closes gh-26521
4 years ago
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance"
See gh-26227
4 years ago
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests
See gh-26441
4 years ago
Andy Wilkinson a623dab0aa Merge branch '2.4.x'
Closes gh-26474
4 years ago
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x
Closes gh-26473
4 years ago
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM
Closes gh-26467
4 years ago
Andy Wilkinson f44c99df26 Merge branch '2.4.x'
Closes gh-26452
4 years ago
Andy Wilkinson fd3d619670 Recommend default Servlet when using Jersey as a Filter
Closes gh-25733
4 years ago