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

2595 Commits

Author SHA1 Message Date
Andy Wilkinson
249b38e07d Merge branch '2.4.x' 
Closes gh-25175
 2021-02-10 19:42:20 +00:00
Andy Wilkinson
9da3b65ff3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25174
 2021-02-10 19:41:56 +00:00
Andy Wilkinson
708cbd7294 Ignore events from other contexts when waiting for DS init to complete 
Fixes gh-24966
 2021-02-10 15:07:44 +00:00
Stephane Nicoll
0f9fb13141 Fix formatting 2021-02-10 15:25:41 +01:00
Stephane Nicoll
a2118e985a Merge branch '2.4.x' 
Closes gh-25170
 2021-02-10 15:17:26 +01:00
Stephane Nicoll
46bc551c2b Merge branch '2.3.x' into 2.4.x 
Closes gh-25169
 2021-02-10 15:14:21 +01:00
Stephane Nicoll
1524793a92 Fix use of deprecated Cassandra properties in integration tests 
Closes gh-25148
 2021-02-10 15:12:20 +01:00
Stephane Nicoll
d436521472 Merge branch '2.4.x' 
Closes gh-25167
 2021-02-10 10:46:56 +01:00
Stephane Nicoll
7cb1605c11 Merge branch '2.3.x' into 2.4.x 
Closes gh-25166
 2021-02-10 10:45:54 +01:00
Stephane Nicoll
e5098697cb Polish "Validate Cassandra defaults" 
See gh-25130
 2021-02-10 10:18:28 +01:00
bono007
f71ab69aeb Validate Cassandra defaults 
See gh-25130
 2021-02-10 10:15:31 +01:00
Stephane Nicoll
d28d82d355 Merge branch '2.4.x' 
Closes gh-25164
 2021-02-10 09:41:28 +01:00
Stephane Nicoll
acc8f3708b Update copyright of changed file 
See gh-25150
 2021-02-10 09:37:04 +01:00
bono007
4ef82c45ac Fix defaults for Cassandra's initQueryTimeout and idleTimeout 
See gh-25150
 2021-02-10 09:36:17 +01:00
Andy Wilkinson
3610fe50b7 Always use SimpleDriverDataSource when creating Liquibase DataSource 
Closes gh-24944
 2021-02-09 17:10:03 +00:00
Stephane Nicoll
dca643500a Polish "Make Scheduler consistent for Spring Integration" 
See gh-25109
 2021-02-09 17:06:43 +01:00
Artem Bilan
c5491cfdd7 Make Scheduler consistent for Spring Integration 
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
 2021-02-09 17:06:43 +01:00
Andy Wilkinson
78e1a812e2 Try to stabilise Cassandra tests by increasing request timeout 
Closes gh-25146
 2021-02-09 15:51:24 +00:00
Andy Wilkinson
db781a0d84 Merge branch '2.4.x' 
See gh-25077
 2021-02-02 15:14:18 +00:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x 
See gh-25076
 2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention 
Closes gh-25074
 2021-02-02 13:03:21 +00:00
Phillip Webb
630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb
c9a2c4e326 Merge branch '2.4.x' 2021-01-26 19:06:48 -08:00
Phillip Webb
4b0ef67e8e Update code for Spring Data 2021.0.0-M3 
See gh-25004
 2021-01-26 18:57:50 -08:00
Andy Wilkinson
5a56f8864f Remove error message attribute instead of blanking it when not included 
Closes gh-24712
 2021-01-22 14:10:02 +00:00
Andy Wilkinson
1370e8ca97 Merge branch '2.4.x' 
Closes gh-24974
 2021-01-22 13:32:47 +00:00
Andy Wilkinson
5362633014 Merge branch '2.3.x' into 2.4.x 
Closes gh-24973
 2021-01-22 13:32:30 +00:00
Andy Wilkinson
0b06ac9938 Use AssertJ's doesNotContainKey 
Closes gh-24970
 2021-01-22 13:28:41 +00:00
Andy Wilkinson
0fc33b020d Remove metadata for Data Solr property 
Data Solr support was removed in 012a1997 so the property is no longer
supported.

See gh-24939
 2021-01-21 16:45:25 +00:00
Andy Wilkinson
977b938977 Upgrade to Flyway 7.5.1 
Closes gh-24961
 2021-01-21 15:28:19 +00:00
Andy Wilkinson
c125e0ee35 Upgrade to Spring Kafka 2.7.0-M1 
Closes gh-24592
 2021-01-21 14:32:41 +00:00
Andy Wilkinson
4135e3c061 Upgrade to Flyway 7.5 
Closes gh-24953
 2021-01-21 12:11:31 +00:00
Andy Wilkinson
d15ec4cdb4 Upgrade to Liquibase 4.2.2 
Closes gh-24952
 2021-01-21 09:47:58 +00:00
Madhura Bhave
cf8e667795 Fix formatting 2021-01-20 15:49:08 -08:00
Madhura Bhave
06263c46ce Upgrade to Spring Security 5.5.0-M1 
Closes gh-24937
 2021-01-20 15:42:25 -08:00
Stephane Nicoll
4c2a7db4f8 Upgrade to Spring Data 2021.0.0-M2 
Closes gh-24931
 2021-01-20 16:18:38 +01:00
Stephane Nicoll
012a199773 Remove Spring Data Solr support 
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.

Closes gh-24939
 2021-01-20 15:03:42 +01:00
Stephane Nicoll
3e376b955d Fix build failure 
See gh-24943
 2021-01-20 14:41:12 +01:00
Stephane Nicoll
2f4d4c7b5d Merge branch '2.4.x' 2021-01-20 14:07:07 +01:00
Stephane Nicoll
56ce5bdf44 Merge branch '2.3.x' into 2.4.x 
See gh-24943
 2021-01-20 14:06:39 +01:00
Stephane Nicoll
244a6ac7e5 Polish "Deprecate Spring Data Solr" 
See gh-24942
 2021-01-20 14:02:59 +01:00
Stephane Nicoll
85729d2a8a Merge branch '2.3.x' into 2.4.x 
Closes gh-24943
 2021-01-20 13:57:18 +01:00
Stephane Nicoll
10b4cb8cb5 Deprecate Spring Data Solr support 
Closes gh-24942
 2021-01-20 13:56:50 +01:00
Andy Wilkinson
294231efe7 Merge branch '2.4.x' 
Closes gh-24883
 2021-01-19 13:22:32 +00:00
Andy Wilkinson
7b4fbd2c85 Document WebMvcProperties.MatchingStrategt as being since 2.4.0 
Closes gh-24875
 2021-01-19 13:22:00 +00:00
Stephane Nicoll
7592c98d5c Merge branch '2.4.x' 
Closes gh-24871
 2021-01-18 14:45:02 +01:00
izeye
21db14227c Fix property name for spring.dao.exceptiontranslation.enabled 
See gh-24867
 2021-01-18 14:41:41 +01:00
Stephane Nicoll
742983fc5e Update copyright of changed file 
See gh-24866
 2021-01-18 14:38:58 +01:00
izeye
41fcc427c6 Restore persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation() 
See gh-24866
 2021-01-18 14:37:34 +01:00
Stephane Nicoll
dcc0ca0df9 Polish contribution 
See gh-24862
 2021-01-18 11:03:27 +01:00