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

2896 Commits

Author SHA1 Message Date
Andy Wilkinson
ae93bb3a11 Merge branch '2.4.x' into 2.5.x 
Closes gh-28479
 2021-10-29 11:12:04 +01:00
Andy Wilkinson
10f0017d69 Fix method validation in child contexts 
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
 2021-10-29 10:08:57 +01:00
Stephane Nicoll
66553ac8c7 Add .gitattributes 
Closes gh-28473
 2021-10-28 15:27:49 +02:00
Stephane Nicoll
1b3f52d609 Harmonize line endings 
See gh-27615
 2021-10-28 15:22:57 +02:00
Andy Wilkinson
50d4eaad63 Merge branch '2.4.x' into 2.5.x 
Closes gh-28439
 2021-10-22 15:23:07 +01:00
Andy Wilkinson
a545b6e0b4 Polish "Polish" 
See gh-28367
 2021-10-22 15:19:13 +01:00
Leo Li
1586232761 Polish 
See gh-28367
 2021-10-22 15:11:57 +01:00
Andy Wilkinson
585b8880c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-22 10:10:50 +01:00
Andy Wilkinson
7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages" 
See 2f6651c3cbe4546158b97a5d02d47634855cf88a.

Closes gh-28408
 2021-10-22 10:08:27 +01:00
Phillip Webb
daf36dff55 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-21 11:27:29 -07:00
Phillip Webb
2f6651c3cb Don't use markdown syntax in javadoc or error messages 
Closes gh-28408
 2021-10-21 11:24:54 -07:00
Andy Wilkinson
f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots 
This reverts commit 196013fc3929106e183241e6af9b9b534c9cdc2b, reversing
changes made to 8b0c563832844938e3f5ad3ae2da1a240ff80d67.

Closes gh-28384
See gh-28241
 2021-10-19 18:41:23 +01:00
Andy Wilkinson
971bdd36fe Start building against Framework 5.3.12 snapshots 
This reverts commit b32a38a8147ccc84cfdfe9edba3eface01fa1a04.

See gh-28223
Closes gh-28369
 2021-10-19 17:50:59 +01:00
Andy Wilkinson
c8e0791b50 Merge branch '2.4.x' into 2.5.x 
Closes gh-28379
 2021-10-19 14:17:53 +01:00
Andy Wilkinson
5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC 
Fixes gh-28378
 2021-10-19 13:52:45 +01:00
Andy Wilkinson
196013fc39 Merge branch '2.4.x' into 2.5.x 
See gh-28241
 2021-10-18 10:23:31 +01:00
Andy Wilkinson
b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC 
See gh-28223
 2021-10-18 10:15:53 +01:00
Phillip Webb
02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb
0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Phillip Webb
9abf9e6731 Modify more tests for static resource location filtering 
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
 2021-10-13 18:45:22 -07:00
Scott Frederick
f427ea5802 Merge branch '2.4.x' into 2.5.x 
Closes gh-28304
 2021-10-12 18:00:15 -05:00
Scott Frederick
3d21ac7a20 Add required id field to Spring Data Neo4j test class 
Fixes gh-28303
 2021-10-12 17:59:19 -05:00
Scott Frederick
3755c563df Merge branch '2.4.x' into 2.5.x 2021-10-12 16:45:51 -05:00
Scott Frederick
3c6e061917 Remove unused import 
See gh-28223
 2021-10-12 16:45:43 -05:00
Scott Frederick
ec6bfa8062 Merge branch '2.4.x' into 2.5.x 2021-10-12 16:17:48 -05:00
Scott Frederick
207b76c39e Modify tests to expect filtering of static resource locations 
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.

See gh-28223
 2021-10-12 16:17:16 -05:00
Andy Wilkinson
1931104d13 Merge branch '2.4.x' into 2.5.x 
Closes gh-28206
 2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e Upgrade to Spring Java Format 0.0.29 
Closes gh-28205
 2021-10-06 09:52:45 +01:00
Andy Wilkinson
d238566920 Merge branch '2.4.x' into 2.5.x 
See gh-28134
 2021-10-01 11:32:22 +01:00
Andy Wilkinson
a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses 
Closes gh-28133
 2021-10-01 11:30:11 +01:00
Phillip Webb
fcb6f557f7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28134
 2021-09-26 13:06:14 -07:00
Phillip Webb
01a39aaf6a Support IPv6 addresses in spring.rabbitmq.addresses 
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.

Fixes gh-28133
 2021-09-26 13:05:17 -07:00
Andy Wilkinson
2ba593328f Order detector for AbstractDataSourceInitializers 
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
 2021-09-22 18:30:44 +01:00
Stephane Nicoll
4ee249c700 Merge branch '2.4.x' into 2.5.x 
Closes gh-28072
 2021-09-21 08:18:39 +02:00
Stephane Nicoll
15de85d89a Polish contribution 
See gh-28061
 2021-09-21 08:18:08 +02:00
Leo Li
0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints" 
See gh-28061
 2021-09-21 08:12:21 +02:00
Andy Wilkinson
8364840cd5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28047
 2021-09-17 12:25:13 +01:00
Andy Wilkinson
eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config 
Closes gh-28038
 2021-09-17 12:00:45 +01:00
Andy Wilkinson
70b2b33f55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27922
 2021-09-09 16:12:25 +01:00
Andy Wilkinson
206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration 
Closes gh-27919
 2021-09-09 16:12:09 +01:00
Andy Wilkinson
128f54fbd0 Merge branch '2.4.x' into 2.5.x 
Closes gh-27911
 2021-09-09 14:40:40 +01:00
Andy Wilkinson
11c79ac650 Move Docker-based reactive Elasticsearch test into separate class 
Closes gh-27907
 2021-09-09 14:39:52 +01:00
Andy Wilkinson
7afaffb80e Merge branch '2.4.x' into 2.5.x 
Closes gh-27905
 2021-09-09 13:38:09 +01:00
Andy Wilkinson
1f2035ae64 Move Docker-based Elasticsearch test into separate class 
Closes gh-27904
 2021-09-09 13:24:26 +01:00
Andy Wilkinson
6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27757
 2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a Polish "Polish access modifiers for test classes" 
See gh-27736
 2021-08-18 17:52:42 +01:00
izeye
8a425dedfd Polish access modifiers for test classes 
See gh-27736
 2021-08-18 17:38:40 +01:00
Andy Wilkinson
533bb24b55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27525
 2021-07-29 17:42:26 +01:00
Andy Wilkinson
ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time 
Closes gh-27524
 2021-07-29 17:33:56 +01:00
Andy Wilkinson
eaca9c7a83 Merge branch '2.4.x' into 2.5.x 
Closes gh-27473
 2021-07-23 13:09:27 +01:00