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

2322 Commits

Author SHA1 Message Date
Phillip Webb
e85b0c7012 Merge branch '2.5.x' 2021-06-23 17:29:41 -07:00
Phillip Webb
fd83158fa5 Merge branch '2.4.x' into 2.5.x 2021-06-23 17:28:31 -07:00
Phillip Webb
5fc0e1ca81 Merge branch '2.5.x' 
Closes gh-27057
 2021-06-23 17:23:25 -07:00
Phillip Webb
af37f59136 Merge branch '2.4.x' into 2.5.x 
Closes gh-27056
 2021-06-23 17:13:13 -07:00
Andy Wilkinson
4290193a65 Merge branch '2.5.x' 
Closes gh-27025
 2021-06-22 13:20:11 +01:00
Andy Wilkinson
051638631b Merge branch '2.4.x' into 2.5.x 
Closes gh-27024
 2021-06-22 13:02:06 +01:00
Andy Wilkinson
ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration" 
See gh-26937
 2021-06-22 12:55:25 +01:00
Yanming Zhou
a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration 
See gh-26937
 2021-06-22 12:55:25 +01:00
Stephane Nicoll
63fe89f641 Merge branch '2.5.x' 
Closes gh-26957
 2021-06-18 08:29:36 +02:00
Yanming Zhou
12a6e4c231 Add missing space for asciidoc ordered list 
See gh-26955
 2021-06-18 08:27:45 +02:00
Phillip Webb
ad8ce2aa05 Merge branch '2.5.x' 2021-06-16 23:43:14 -07:00
Phillip Webb
5c65b1bcde Fix asciidoctor anchor references 
See gh-26939
 2021-06-16 23:42:29 -07:00
Phillip Webb
7bd6611e4c Merge branch '2.5.x' 
Closes gh-26940
 2021-06-16 22:43:52 -07:00
Phillip Webb
c3b873c11d Merge branch '2.4.x' into 2.5.x 
Closes gh-26939
 2021-06-16 22:43:13 -07:00
Phillip Webb
b5c92d5174 Allow indirect standard profile-specific imports 
Effectively revert commit d1b256a16936 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
 2021-06-16 22:30:29 -07:00
Stephane Nicoll
a1a86e75ac Merge branch '2.5.x' 
Closes gh-26912
 2021-06-15 08:38:51 +02:00
Stephane Nicoll
96029dbd8a Polish "Add Azure info to the cloud deployment docs" 
See gh-26910
 2021-06-15 08:35:56 +02:00
Andy Clement
8321faaf16 Add Azure info to the cloud deployment docs 
See gh-26910
 2021-06-15 08:34:29 +02:00
Stephane Nicoll
52fedb2bb4 Add support for InfluxDB 2.x 
Closes gh-25891
 2021-06-15 08:21:37 +02:00
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.
 2021-06-14 10:48:49 -07:00
Madhura Bhave
91ca9763e0 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.
 2021-06-14 10:25:01 -07:00
Andy Wilkinson
bc715c64b1 Merge branch '2.5.x' 
Closes gh-26892
 2021-06-14 13:33:19 +01:00
Andy Wilkinson
5f26fd9ccb Merge branch '2.4.x' into 2.5.x 
Closes gh-26891
 2021-06-14 13:28:54 +01:00
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
 2021-06-14 13:24:01 +01:00
Stephane Nicoll
a0cf1eed41 Add support for customizing the auto-configured ClientResources 
Closes gh-26792
 2021-06-14 09:32:43 +02:00
Stephane Nicoll
f8555b9071 Add metrics for task execution and scheduling 
Closes gh-23818
 2021-06-14 09:07:40 +02:00
Stephane Nicoll
6505e03cb2 Polish "Add auto-configuration for Spring Data Envers" 
See gh-22610
 2021-06-14 08:28:17 +02:00
Stephane Nicoll
d17c475504 Polish "Enable Redis connection pool if commons-pool2 is available" 
See gh-26326
 2021-06-14 08:25:21 +02:00
Stephane Nicoll
6b4efcce11 Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder" 
See gh-26341
 2021-06-12 17:51:57 +02:00
Stephane Nicoll
69c2621a14 Polish "Add support for @Value annotation" 
See gh-26337
 2021-06-12 17:40:34 +02:00
bono007
e3f03dd50a Add auto-configuration for DiskSpaceMetrics 
See gh-26001
 2021-06-11 17:01:36 +02:00
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