Andy Wilkinson
2f83a6714b
Rework DataSource initialization
...
Previously, DataSource initialization was triggered via a
BeanPostProcessor or a schema created event from JPA. This caused
numerous problems with circular dependencies, bean lifecycle, etc and
added significant complexity.
This commit reworks DataSource initialization to remove the use of a
BeanPostProcessor entirely. In its place, DataSource initialization is
now driven by an InitializingBean with dependency relationships
between beans ensuring that initialization has been performed before
the DataSource is used. This aligns with the approach that's worked
well with Flyway and Liquibase.
More changes are planned to further simplify DataSource initialization.
The changes in this commit are a foundation for those changes. Any new
public API in this commit is highly likely to change before the next
GA.
Fixes gh-13042
Fixes gh-23736
2021-02-17 12:10:22 +00:00
Stephane Nicoll
9bc4f8ede1
Polish "Group jdbc-related batch properties beneath spring.batch.jdbc"
...
See gh-25316
2021-02-17 11:29:35 +01:00
Mukul Chaundhyan
d093807f95
Group jdbc-related batch properties beneath spring.batch.jdbc
...
See gh-25316
2021-02-17 10:22:21 +01:00
Andy Wilkinson
9a3889baec
Align with breaking change in Spring Data MongoDB
...
See gh-25004
2021-02-16 15:14:54 +00:00
Stephane Nicoll
696179762d
Align default values for Cassandra's throttling properties
...
Closes gh-25149
2021-02-16 15:08:32 +01:00
Andy Wilkinson
ed03ac19bc
Polish
2021-02-16 13:09:35 +00:00
Andy Wilkinson
accd3c0946
Merge branch '2.4.x'
...
Closes gh-25311
2021-02-16 12:44:47 +00:00
Andy Wilkinson
0dbf907f73
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25310
2021-02-16 12:43:20 +00:00
Andy Wilkinson
78941c32c4
Polish "Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used"
...
See gh-25279
2021-02-16 12:08:08 +00:00
Eddú Meléndez
c55200d19a
Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used
...
See gh-25279
2021-02-16 12:06:09 +00:00
Andy Wilkinson
9628df87ff
Merge branch '2.4.x'
...
Closes gh-25304
2021-02-16 10:34:54 +00:00
Andy Wilkinson
55e3ca66e2
Replace native image system property with call to NativeDetector
...
Closes gh-25303
2021-02-16 10:34:34 +00:00
Stephane Nicoll
9b7581a8ef
Polish "Fix database name detection logic for MariaDB"
...
See gh-25173
2021-02-15 14:24:08 +01:00
Stephane Nicoll
8c0c30e7a8
Polish "Add support to auto-configure javax.jms.ExceptionListener"
...
See gh-25278
2021-02-15 13:58:25 +01:00
Eddú Meléndez
1f00c27c7e
Add support to auto-configure javax.jms.ExceptionListener
...
See gh-25278
2021-02-15 13:56:25 +01:00
Stephane Nicoll
3f9f9a4637
Polish "Start building against Spring Data Neumann-SR7 snapshots"
...
See gh-25282
2021-02-15 13:46:39 +01:00
Stephane Nicoll
a16a2de3c3
Merge branch '2.4.x'
...
Closes gh-25296
2021-02-15 10:13:16 +01:00
Stephane Nicoll
0bc03c7141
Associate application classloader to auto-configured Hazelcast instance
...
Closes gh-24836
2021-02-15 10:08:23 +01:00
Stephane Nicoll
349d755632
Start building against Spring Kafka 2.7.0-M2 snapshots
...
See gh-25295
2021-02-15 08:14:35 +01:00
Stephane Nicoll
ca9b583c7d
Merge branch '2.4.x'
...
Closes gh-25271
2021-02-14 09:37:49 +01:00
Stephane Nicoll
61e9d04c68
Update copyright of changes files
...
See gh-25266
2021-02-14 09:35:36 +01:00
izeye
f48893def5
Polish
2021-02-14 09:34:30 +01:00
Stephane Nicoll
3471adcf09
Merge branch '2.3.x' into 2.4.x
2021-02-14 09:32:21 +01:00
Stephane Nicoll
b7f5f5cac0
Polish
...
See gh-25266
2021-02-14 09:29:48 +01:00
Andy Wilkinson
3c0972e7f9
Upgrade to Spring Security 5.5.0-M2
...
Closes gh-25255
2021-02-12 13:37:49 +00:00
Andy Wilkinson
dadd6241ac
Upgrade to Nimbus JOSE JWT 9.5
...
Closes gh-25249
2021-02-12 13:37:49 +00:00
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
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
Phillip Webb
72dd3b5628
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24747
2021-01-11 14:21:56 -08:00
Phillip Webb
f9e3e0d532
Register default resource path using a Resource
...
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.
Closes gh-24745
2021-01-11 14:20:46 -08:00
Phillip Webb
21a08ed37d
Merge branch '2.4.x'
...
Closes gh-24746
2021-01-11 13:58:48 -08:00
Phillip Webb
53a6fa2fed
Respect spring.dao.exceptiontranslation setting
...
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.
Fixes gh-24321
2021-01-11 13:57:47 -08:00
Phillip Webb
3fc1d319fe
Merge branch '2.4.x'
2021-01-11 13:40:32 -08:00
Phillip Webb
cff3e4c831
Fix tests following upstream framework changes
2021-01-11 13:39:21 -08:00
Stephane Nicoll
6bf74e5752
Polish
2021-01-11 14:39:56 +01:00
Stephane Nicoll
0897af0dfa
Add customizer for jOOQ's configuration
...
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.
Closes gh-24732
2021-01-11 14:16:34 +01:00
Stephane Nicoll
8a6e79dc8b
Configure Couchbase to use the application's ObjectMapper
...
Closes gh-24616
2021-01-10 10:10:42 +01:00
Scott Frederick
bd4c6e51fa
Merge branch '2.4.x'
...
Closes gh-24687
2021-01-07 10:36:06 -06:00
Scott Frederick
ef7a82756e
Allow overriding ThemeResolver and FlashMapManager beans
...
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.
Fixes gh-24207
2021-01-07 10:29:13 -06:00
Stephane Nicoll
8cd07dbc60
Polish
...
See gh-21286
2020-12-24 11:10:37 +01:00