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

2680 Commits

Author SHA1 Message Date
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
izeye
3aea8b37a0 Polish 
See gh-24862
 2021-01-18 10:58:27 +01:00
Stephane Nicoll
bcc1331f85 Restore missing deprecated metadata for Bitronix 
See gh-24806
 2021-01-18 10:29:21 +01:00
izeye
e7350503b8 Polish 
See gh-24837
 2021-01-15 14:37:33 +01:00
Stephane Nicoll
2c2c160579 Remove deprecated code 
See gh-24806
 2021-01-15 14:14:33 +01:00
Stephane Nicoll
a18f01addf Remove bitronix support 
See gh-24806
 2021-01-15 14:14:27 +01:00
Stephane Nicoll
a788ef4958 Merge branch '2.4.x' 
Closes gh-24842
 2021-01-14 18:03:38 +01:00
Stephane Nicoll
2072e7242a Merge branch '2.3.x' into 2.4.x 
Closes gh-24841
 2021-01-14 18:02:28 +01:00
Stephane Nicoll
283ed48d63 Unwrap Datasource against an actual interface 
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.

Closes gh-24697
 2021-01-14 18:00:35 +01:00
Andy Wilkinson
31fe24c451 Merge branch '2.4.x' 
Closes gh-24791
 2021-01-12 16:04:04 +00:00
Andy Wilkinson
5cae1a2842 Merge branch '2.3.x' into 2.4.x 
Closes gh-24790
 2021-01-12 16:03:48 +00:00
Andy Wilkinson
7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available 
Fixes gh-24624
 2021-01-12 15:47:33 +00:00
Phillip Webb
66598ed4ad Merge branch '2.4.x' 2021-01-11 16:42:17 -08:00
Phillip Webb
bd21c43d71 Simplify resource registration 
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
 2021-01-11 16:40:42 -08:00
Phillip Webb
a8f291b252 Merge branch '2.4.x' 
Closes gh-24749
 2021-01-11 15:24:25 -08:00
Phillip Webb
f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x 
Closes gh-24748
 2021-01-11 14:53:57 -08:00