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

1605 Commits

Author SHA1 Message Date
Andy Wilkinson
997f7cbfce Merge branch '2.7.x' 2022-03-08 14:09:59 +00:00
Andy Wilkinson
dfd4097436 Merge branch '2.6.x' into 2.7.x 
Closes gh-30101
 2022-03-08 14:09:47 +00:00
Andy Wilkinson
5b2cc74f71 Merge branch '2.5.x' into 2.6.x 
Closes gh-30100
 2022-03-08 14:09:35 +00:00
Andy Wilkinson
708e57eafb Register metrics for wrapped R2DBC ConnectionPools 
Closes gh-30090
 2022-03-08 13:55:34 +00:00
Moritz Halbritter
1793cee00f Start building against Micrometer 2.0.0-M3 
See gh-29753
 2022-03-04 11:03:22 +01:00
Andy Wilkinson
bd0829a382 Merge branch '2.7.x' 2022-03-03 14:48:03 +00:00
Andy Wilkinson
ff7321cc5a Polish "Support overriding the default SanitizingFunction" 
See gh-30006
 2022-03-03 14:24:51 +00:00
Guirong Hu
fb9112c891 Support overriding the default SanitizingFunction 
See gh-30006
 2022-03-03 14:19:14 +00:00
Moritz Halbritter
0072cc807c Suppress deprecation warnings caused by micrometer backwards compatability 2022-03-01 14:00:27 +01:00
Moritz Halbritter
7897a913a7 Start building against Micrometer 1.9.0-M4 snapshots 
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.

See gh-30014
 2022-03-01 09:20:07 +01:00
Phillip Webb
5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Moritz Halbritter
54f1058d63 Merge branch '2.7.x' 2022-02-23 16:10:49 +01:00
Moritz Halbritter
9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 2022-02-23 15:39:46 +01:00
Moritz Halbritter
03e5dcdb3a Merge branch '2.7.x' 2022-02-21 13:34:11 +01:00
Moritz Halbritter
1325153ee9 Move ManagementContextConfiguration from spring.factories 
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.

Closes gh-29730
 2022-02-21 13:16:12 +01:00
Moritz Halbritter
d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
Moritz Halbritter
d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates 
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
 2022-02-21 10:34:38 +01:00
Scott Frederick
cb69d01e04 Merge branch '2.7.x' into main 2022-02-17 19:07:24 -06:00
Scott Frederick
42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter 
Fixes gh-29897
 2022-02-17 19:06:13 -06:00
Moritz Halbritter
42808ff13c Merge branch '2.7.x' 
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
 2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641 Move our auto-configurations from spring.factories to new file 
Closes gh-29873
 2022-02-17 10:18:46 +01:00
Moritz Halbritter
303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter
7d68b58c8f Load auto-configurations from META-INF/spring-boot 
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
 2022-02-17 09:17:23 +01:00
Phillip Webb
ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Moritz Halbritter
fdb1010cbc Migrate auto-configurations to @AutoConfiguration 
Closes gh-29871
 2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8 Migrate auto-configurations to @AutoConfiguration 
Closes gh-29871
 2022-02-16 13:55:16 +01:00
Stephane Nicoll
b22e3d51dc Merge branch '2.7.x' 2022-02-04 10:10:29 +01:00
Henning Poettker
e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility 
See gh-29200
 2022-02-04 09:57:59 +01:00
Phillip Webb
a282f912e6 Organize imports 
Organize imports according to updated checkstyle rules.
 2022-02-02 19:16:13 -08:00
Phillip Webb
501d174db0 Merge branch '2.7.x' 2022-02-02 10:38:46 -08:00
Phillip Webb
ce08b519b1 Merge branch '2.6.x' into 2.7.x 2022-02-02 10:37:55 -08:00
Phillip Webb
50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Stephane Nicoll
41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +01:00
Stephane Nicoll
f812b33cbd Merge branch '2.6.x' into 2.7.x 
Closes gh-29613
 2022-02-01 11:07:31 +01:00
Stephane Nicoll
136b5959c3 Merge branch '2.5.x' into 2.6.x 
Closes gh-29612
 2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6 Polish "Enforce use of BDDMockito" 
See gh-29178
 2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf Enforce use of BDDMockito 
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
 2022-02-01 09:37:15 +01:00
Stephane Nicoll
68bd6f91cf Merge branch '2.7.x' 2022-01-29 15:34:16 +01:00
Stephane Nicoll
a94b176c39 Merge branch '2.6.x' into 2.7.x 
Closes gh-29595
 2022-01-29 15:34:08 +01:00
izeye
118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests 
See gh-29593
 2022-01-29 15:33:25 +01:00
Madhura Bhave
8125b46ed5 Merge branch '2.7.x' into main 2022-01-27 12:09:51 -08:00
Madhura Bhave
81bbd295e9 Merge branch '2.6.x' into 2.7.x 
Closes gh-29584
 2022-01-27 12:04:26 -08:00
Madhura Bhave
0597c6831e Configure health on additional path only when health exposed 
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
 2022-01-27 11:44:54 -08:00
Andy Wilkinson
de3b9a4910 Remove code deprecated for removal in 2.x 
Closes gh-29482
 2022-01-19 17:25:14 +00:00
Stephane Nicoll
4d03f89a55 Harmonize dependency upgrades with Spring Boot 2.7.0-M1 
Closes gh-29476
 2022-01-19 10:39:18 +01:00
Stephane Nicoll
90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll
8ec8268a77 Merge branch '2.7.x' 2022-01-10 12:07:19 +01:00
Stephane Nicoll
c02faea9c9 Allow WebMvcFilter to be overridden by user configuration 
Closes gh-28428
 2022-01-10 12:02:08 +01:00
Stephane Nicoll
5f67546534 Adapt to latest API change in SD Elasticsearch 
See gh-29292
 2022-01-09 22:24:05 +01:00