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

2291 Commits

Author SHA1 Message Date
Madhura Bhave
2e2d1fe8d3 Merge branch '2.4.x' into main 2021-06-09 14:46:36 -07:00
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
de410b7621 Merge branch '2.4.x' 
Closes gh-26828
 2021-06-09 18:01:32 +01:00
Andy Wilkinson
a1c5fcca58 Move common Asciidoctor configuration into our conventions 
Closes gh-26620
 2021-06-09 18:00:45 +01:00
Phillip Webb
f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Andy Wilkinson
c52143727a Reinstate mode for controlling DB initialization 
Closes gh-26682
 2021-06-08 15:13:55 +01:00
Phillip Webb
abd926788f Merge branch '2.4.x' 
Closes gh-26782
 2021-06-06 21:53:10 -07: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
554cf9d7c7 Merge branch '2.4.x' into main 
Closes gh-26741
 2021-06-02 12:24:36 -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
1f95989e85 Merge branch '2.4.x' 
Closes gh-26735
 2021-06-02 13:56:13 +02: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
54c3194164 Merge branch '2.4.x' into main 
Closes gh-26701
 2021-05-28 14:38:28 -07: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
e5ee1eb86f Merge branch '2.4.x' 
See gh-26654
 2021-05-26 09:27:52 +02:00
Stephane Nicoll
130261f0df Merge branch '2.3.x' into 2.4.x 
See gh-26653
 2021-05-26 09:21:17 +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
f3d4fdb9c4 Merge branch '2.4.x' 
Closes gh-26655
 2021-05-25 10:46:40 +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
Oliver B. Fischer
11af8a816c Add link to Maven Git Commit Id Plugin 
See gh-26635
 2021-05-23 16:37:44 +02:00
Phillip Webb
ab958d2394 Include io.spring.asciidoctor.backends group 
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
 2021-05-19 22:58:31 -07:00
Phillip Webb
8a3f835ffe Set Asciidoctor attribute-missing to warn 
Closes gh-26590
 2021-05-19 11:53:46 -07:00
weixsun
d2bdcddb5f Fix outdated defaults for Info endpoint 
See gh-26591
 2021-05-19 17:42:13 +02:00
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
 2021-05-18 21:19:24 -07:00
Phillip Webb
86a5c90d20 Simplify anchor-rewrite.properties 2021-05-18 21:19:09 -07:00
Phillip Webb
e08d4f1fe6 Move "Use Jedis Instead of Lettuce" How-to 
See gh-26262
 2021-05-18 11:53:26 -07:00
Phillip Webb
499a29c415 Move "Testcontainers" How-to 
See gh-26262
 2021-05-18 11:49:03 -07:00
Phillip Webb
72d50ed2f8 Move "Testing With Spring Security" How-to 
See gh-26262
 2021-05-18 11:49:02 -07:00
Phillip Webb
5f7e3d3952 Polish 2021-05-18 11:39:20 -07:00
Andy Wilkinson
88b383c6bb Polish "Update docs and internal dep mgmt following Spock 2.0's release" 
See gh-26586
 2021-05-18 10:00:05 +01:00
dreis2211
5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release 
See gh-26586
 2021-05-18 09:59:29 +01:00
Andy Wilkinson
4bf5ff8a68 Merge branch '2.4.x' 
Closes gh-26526
 2021-05-17 11:52:53 +01: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
05a64ecb2c Merge branch '2.4.x' 
Closes gh-26522
 2021-05-17 11:24:29 +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
weixsun
8a2be288a3 Remove unnecessary throws declaration in tests 
See gh-26441
 2021-05-17 09:31:51 +02:00
Andy Wilkinson
a623dab0aa Merge branch '2.4.x' 
Closes gh-26474
 2021-05-15 08:57:23 +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
f44c99df26 Merge branch '2.4.x' 
Closes gh-26452
 2021-05-13 14:01:37 +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