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

2963 Commits

Author SHA1 Message Date
Phillip Webb
dafd511284 Support DatabaseInitializerDetector ordering 
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.

Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.

See gh-26692
 2021-06-08 14:10:55 -07:00
Andy Wilkinson
c52143727a Reinstate mode for controlling DB initialization 
Closes gh-26682
 2021-06-08 15:13:55 +01:00
Stephane Nicoll
e9ed92a305 Polish 2021-06-02 14:14:04 +02:00
Stephane Nicoll
d0185e7531 Merge branch '2.4.x' 
Closes gh-26717
 2021-05-31 07:47:59 +02:00
Stephane Nicoll
897fd63faf Merge branch '2.3.x' into 2.4.x 
Closes gh-26716
 2021-05-31 07:47:45 +02:00
weixsun
4b3bf75a4c Remove redudant space 
See gh-26713
 2021-05-31 07:47:07 +02:00
Phillip Webb
e55948456f Respect custom username/password properties 
Fix a bug in `DataSourceInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
 2021-05-26 15:51:34 -07:00
Madhura Bhave
4416859a81 Merge branch '2.4.x' into main 2021-05-24 21:11:42 -07:00
Madhura Bhave
4955c80da5 Remove test that is no long necessary 2021-05-24 21:10:50 -07:00
Madhura Bhave
ae24d66af7 Merge branch '2.4.x' into main 
Closes gh-26649
 2021-05-24 16:42:32 -07:00
Madhura Bhave
8f2b180eb6 Use Sso Binding from SAML metadata uri if present 
If the property is explicitly configured, that gets used.
If none are present, we rely on Spring Security's default value of
REDIRECT.

Fixes gh-26454
 2021-05-24 16:37:31 -07:00
Phillip Webb
15042e2710 Merge branch '2.4.x' 
Closes gh-26623
 2021-05-20 14:43:11 -07:00
Phillip Webb
6bf069d9e0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26622
 2021-05-20 14:42:54 -07:00
Phillip Webb
004363ceaf Use WebMvcConfigurer to add resource handlers 
Move resource handler auto-configuration logic back to the
`WebMvcConfigurer` so that they also get applied to child contexts.

Closes gh-25743
 2021-05-20 14:16:23 -07:00
Andy Wilkinson
4517f6057e Merge branch '2.4.x' 
Closes gh-26573
 2021-05-17 13:50:13 +01:00
Andy Wilkinson
1d5abf5af7 Merge branch '2.3.x' into 2.4.x 
Closes gh-26572
 2021-05-17 13:49:25 +01:00
Andy Wilkinson
eecb7dd101 Remove stale jboss-transaction-spi dependencies 
Closes gh-26569
 2021-05-17 13:49:16 +01:00
Andy Wilkinson
24d252e322 Upgrade to Couchbase Client 3.1.5 
Closes gh-26531
 2021-05-17 13:39:53 +01:00
Stephane Nicoll
d3c817b7ba Polish "Remove unnecessary throws declaration in tests" 
See gh-26441
 2021-05-17 09:36:53 +02:00
weixsun
8a2be288a3 Remove unnecessary throws declaration in tests 
See gh-26441
 2021-05-17 09:31:51 +02:00
Stephane Nicoll
691bbcfdfd Update copyright year of changed files 
See gh-26448
 2021-05-16 15:29:48 +02:00
weixsun
d115361980 Remove redundant suppression 
See gh-26448
 2021-05-16 15:10:48 +02:00
Andy Wilkinson
000d84eedd Merge branch '2.4.x' 
Closes gh-26461
 2021-05-14 11:58:31 +01:00
Andy Wilkinson
c2ef7578e8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26460
 2021-05-14 11:41:24 +01:00
Andy Wilkinson
444474926c Configure JTA tests to write logs beneath build/ 
Closes gh-26440
 2021-05-14 11:40:43 +01:00
Stephane Nicoll
efc0a7da44 Properly assert that auto-configured TaskExecutor is lazy 
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
 2021-05-12 07:34:58 +02:00
Stephane Nicoll
0e2bb5f179 Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests" 
See gh-26416
 2021-05-11 17:19:24 +02:00
nguyensach
b263f126fa Polish SpringApplicationAdminJmxAutoConfigurationTests 
See gh-26416
 2021-05-11 17:19:24 +02:00
Stephane Nicoll
f042dcf0e0 Properly assert that auto-configured TaskExecutor is lazy 
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
 2021-05-11 17:17:28 +02:00
Stephane Nicoll
2e0481ca28 Remove useless overrides of ConditionalOnProperty#matchIfMissing 
Closes gh-26432
 2021-05-11 16:48:05 +02:00
Andy Wilkinson
b1f3d91f7d Make sure the Couchbase's Jackson module is available 
When we customize Couchbase's JacksonJsonSerializer with the
auto-configured ObjectMapper, Couchbase's JsonValueModule is lost.
This prevents the storage and retrieval of JSON objects.

This commit updates the Couchbase auto-configuration to use a copy
of the auto-configured ObjectMapper with the JsonValueModule added
to it.

Fixes gh-26363
 2021-05-06 19:40:47 +01:00
Andy Wilkinson
6de10ff791 Merge branch '2.4.x' 
Closes gh-26237
 2021-04-26 15:53:37 +01:00
Andy Wilkinson
11fa850b97 Merge branch '2.3.x' into 2.4.x 
Closes gh-26236
 2021-04-26 15:53:18 +01:00
Andy Wilkinson
4a990f3ed2 Use bean class loader when importing auto-configuration 
Fixes gh-26234
 2021-04-26 15:38:01 +01:00
Brian Clozel
1732d8ccf7 Merge branch '2.4.x' 
Closes gh-26233
 2021-04-26 11:37:20 +02:00
Brian Clozel
7be9c268b8 Fix ignored use-last-modified property in Spring MVC 
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
 2021-04-26 11:34:47 +02:00
Phillip Webb
2f852fa256 Update copyright year of changed files 2021-04-23 23:42:14 -07:00
Phillip Webb
3075ac0f54 Formatting 2021-04-23 11:17:49 -07:00
Andy Wilkinson
b9348c6d28 Merge branch '2.4.x' 
Closes gh-26169
 2021-04-20 11:26:46 +01:00
Stephane Nicoll
531ee83c6a Merge branch '2.4.x' 
Closes gh-26156
 2021-04-19 14:33:17 +02:00
Stephane Nicoll
54613c77d4 Exclude beans with scheduled methods from global lazy init 
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
 2021-04-19 14:04:03 +02:00
Stephane Nicoll
221f36ba93 Add missing value provider metadata for SQL init resources 
Closes gh-26154
 2021-04-19 09:51:51 +02:00
zuisong
95a9f36ac1 Fix wrong replacements for spring.datasource.[schema|data] 
See gh-26150
 2021-04-19 09:27:24 +02:00
Phillip Webb
a48c98b469 Revert "Switch default MVC path matching strategy" 
This reverts commit ab8e599cfedd6d626daaee65fc86d8c0ae470d16.

See gh-24805
 2021-04-15 17:35:24 -07:00
Phillip Webb
beaf03a008 Update copyright year of changed files 2021-04-15 12:22:48 -07:00
izeye
e27c85698d Polish 
See gh-26135
 2021-04-15 16:31:10 +02:00
Stephane Nicoll
8c15e693d3 Merge branch '2.4.x' 
Closes gh-26109
 2021-04-14 15:07:23 +02:00
Stephane Nicoll
0d81b4d07e Merge branch '2.3.x' into 2.4.x 
Closes gh-26108
 2021-04-14 15:04:28 +02:00
Stephane Nicoll
c04d640452 Scan for ElasticSearch's @Document type 
Closes gh-26028
 2021-04-14 14:42:32 +02:00
Stephane Nicoll
62a70475c2 Fix class condition on deprecated class 
Closes gh-26107
 2021-04-14 13:30:20 +02:00