fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,331 Commits 22 Branches 339 Tags
Commit Graph

2108 Commits

Author SHA1 Message Date
Madhura Bhave
e3042b38f5 Merge branch '2.3.x' into 2.4.x 2021-06-09 14:45:23 -07:00
Madhura Bhave
63806d5bac Remove duplicate copyright notice from docs 2021-06-09 14:44:44 -07:00
Andy Wilkinson
a1c5fcca58 Move common Asciidoctor configuration into our conventions 
Closes gh-26620
 2021-06-09 18:00:45 +01:00
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
 2021-06-06 21:05:54 -07:00
Madhura Bhave
2ff3fe22e5 Merge branch '2.3.x' into 2.4.x 
Closes gh-26740
 2021-06-02 12:20:02 -07:00
Madhura Bhave
d0e2925dcc Fix link to Spring Data JPA docs 
Fixes gh-26736
 2021-06-02 12:18:57 -07:00
Stephane Nicoll
363c43e315 Merge branch '2.3.x' into 2.4.x 
Closes gh-26734
 2021-06-02 13:52:03 +02:00
Stephane Nicoll
3f23b9265d Clarify when a connection pool is created for Redis 
Closes gh-26733
 2021-06-02 13:49:16 +02:00
Madhura Bhave
5314bda48d Merge branch '2.3.x' into 2.4.x 
Closes gh-26700
 2021-05-28 14:30:44 -07:00
Madhura Bhave
f55e4c08f5 Add note about Kubernetes termination grace period 
Closes gh-26469
 2021-05-28 14:30:04 -07:00
Stephane Nicoll
454d72d9b2 Document spring.profiles.default in the reference guide 
Closes gh-26592
 2021-05-28 13:29:27 +02:00
Stephane Nicoll
3fbf5eeb5b Document spring.profiles.default in the reference guide 
Closes gh-26592
 2021-05-26 09:20:58 +02:00
Stephane Nicoll
fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation" 
See gh-26421
 2021-05-25 10:45:08 +02:00
Lovekesh Garg
944ba34556 Clarify Kotlin version requirements in documentation 
See gh-26421
 2021-05-25 10:44:51 +02:00
Andy Wilkinson
2ef7d136ac Merge branch '2.3.x' into 2.4.x 
Closes gh-26525
 2021-05-17 11:48:34 +01:00
Andy Wilkinson
ca85555fde Polish "Document use of module replacements to swap dependencies" 
See gh-25944
 2021-05-17 11:44:23 +01:00
Caleb Cushing
f5b536164c Document use of module replacements to swap dependencies 
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
 2021-05-17 11:29:36 +01:00
Andy Wilkinson
2a2c68f8f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26521
 2021-05-17 11:22:48 +01:00
Andy Wilkinson
be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance" 
See gh-26227
 2021-05-17 11:07:42 +01:00
Andy Wilkinson
3295b59563 Merge branch '2.3.x' into 2.4.x 
Closes gh-26473
 2021-05-15 08:56:09 +01:00
Andy Wilkinson
47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM 
Closes gh-26467
 2021-05-15 08:55:59 +01:00
Andy Wilkinson
fd3d619670 Recommend default Servlet when using Jersey as a Filter 
Closes gh-25733
 2021-05-13 13:58:07 +01:00
Stephane Nicoll
f8a4aefce0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26298
 2021-04-29 12:29:55 +02:00
Stephane Nicoll
0c09841013 Document property names to enable reactive health indicators 
Closes gh-26279
 2021-04-29 12:28:43 +02:00
Stephane Nicoll
77a231d742 Merge branch '2.3.x' into 2.4.x 
Closes gh-26282
 2021-04-28 16:14:46 +02:00
Stephane Nicoll
e7bf0a0bd6 Fix key to datasource health indicator in reference doc 
Closes gh-26268
 2021-04-28 16:14:06 +02:00
Andy Wilkinson
a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson
a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Phillip Webb
94a70d6837 Merge branch '2.3.x' into 2.4.x 
Closes gh-26241
 2021-04-26 17:42:00 -07:00
Phillip Webb
f82b33698d Add missing asciidoctor heading anchors 
Closes gh-26239
 2021-04-26 17:35:14 -07:00
Stephane Nicoll
e424c1c4b4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26210
 2021-04-22 14:48:15 +02:00
Shimizu, Yuko
474e460d5e Align Maven version in system requirements with what is actually tested 
See gh-26209
 2021-04-22 14:47:29 +02:00
Stephane Nicoll
db7460ddd5 Polish contribution based on Andy's review 
See gh-26188
 2021-04-21 17:23:21 +02:00
izeye
4be48d0d50 Polish 
See gh-26188
 2021-04-21 15:20:06 +02:00
Stephane Nicoll
8edeb2c7a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-26185
 2021-04-21 10:03:32 +02:00
Stephane Nicoll
856e0d0535 Document that MeterFilters are only applied to a managed registry 
Closes gh-25610
 2021-04-21 10:02:57 +02:00
Andy Wilkinson
bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson
82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll
6bbd36c77a Merge branch '2.3.x' into 2.4.x 
Closes gh-26159
 2021-04-19 17:01:28 +02:00
Stephane Nicoll
03b65f3260 Polish "Enhance multiple entity manager factories how-to" 
See gh-14928
 2021-04-19 16:59:31 +02:00
Niclas Fredriksson
0d9db46f68 Enhance multiple entity manager factories how-to 
See gh-14928
 2021-04-19 16:53:50 +02:00
Stephane Nicoll
401ebc672b Merge branch '2.3.x' into 2.4.x 
Closes gh-26110
 2021-04-14 15:43:57 +02:00
Stephane Nicoll
ab785d9417 Document limitations of using deferred JPA bootstrap 
Closes gh-24027
 2021-04-14 15:38:34 +02:00
Stephane Nicoll
1855f96d07 Polish "Document spring.config.additional-location should be used early" 
See gh-26085
 2021-04-14 10:06:06 +02:00
Shannon Carey
b0b1c04fc4 Document spring.config.additional-location should be used early 
See gh-26085
 2021-04-14 10:03:56 +02:00
Stephane Nicoll
fd6ad5b889 Merge branch '2.3.x' into 2.4.x 
Closes gh-26024
 2021-04-12 14:19:41 +02:00
Stephane Nicoll
7286c33f53 Document default behaviour of DataJpaTest#showSql 
Closes gh-25843
 2021-04-12 14:14:36 +02:00
dreis2211
afd4b582ed Fix typos in docs 
See gh-25947
 2021-04-09 14:18:53 +02:00
Tommy Ludwig
3746385f98 Polish HealthIndicators table in docs 
`=======` was showing up in the header of the table, which should not
be there.

See gh-25882
 2021-04-05 09:10:25 +02:00
Stephane Nicoll
6b9032b4d3 Document that Java 16 is supported 
Closes gh-25527
 2021-03-15 16:08:56 +01:00