Commit Graph

2824 Commits

Author SHA1 Message Date
Andy Wilkinson 2560f261cd Merge branch '2.3.x' into 2.4.x
Closes gh-25692
2021-03-16 16:35:31 +00:00
Andy Wilkinson a832cc9ccd Polish "Improve error message when no resources exist at a script location"
See gh-25620
2021-03-16 16:20:11 +00:00
Yuta Saito 42841b895f Improve error message when no resources exist at a script location
See gh-25620
2021-03-16 16:19:27 +00:00
Andy Wilkinson 17ecf18a15 Upgrade to MongoDB 4.2.2
Closes gh-25675
2021-03-16 13:54:29 +00:00
Andy Wilkinson 4a75798acc Upgrade to Flyway 7.7.0
Closes gh-25660
2021-03-16 13:54:27 +00:00
Stephane Nicoll 9b0cdac97a Add support for external configuration for Cassandra
Closes gh-24065
2021-03-15 10:44:13 +01:00
Stephane Nicoll e517ee8635 Merge branch '2.4.x'
Closes gh-25618
2021-03-13 18:22:57 +01:00
izeye 09f4d4b9bf Polish
See gh-25617
2021-03-13 18:08:54 +01:00
Stephane Nicoll 46baf462ac Start building against Spring Data 2021.0.0-M5 snapshots
See gh-25548
2021-03-11 14:36:57 +01:00
Andy Wilkinson c19e5c9212 Merge branch '2.4.x'
Closes gh-25604
2021-03-11 11:13:13 +00:00
Andy Wilkinson c43ae0b2d3 Merge branch '2.3.x' into 2.4.x
Closes gh-25603
2021-03-11 11:12:54 +00:00
maruoovv b401be1589 Correct javadoc for ON_PARAM
See gh-25480
2021-03-11 11:12:04 +00:00
Stephane Nicoll 858c3ec2a7 Merge branch '2.4.x'
Closes gh-25570
2021-03-10 13:25:14 +01:00
Stephane Nicoll d5b1fd5b31 Merge branch '2.3.x' into 2.4.x
Closes gh-25569
2021-03-10 13:24:32 +01:00
Stephane Nicoll c8101f8c9b Remove host name in R2DBC's embedded H2 url
Closes gh-25560
2021-03-10 13:24:08 +01:00
Andy Wilkinson 5863edfdda Simplify code that makes hal the default json media type
See gh-25546
2021-03-10 12:14:54 +00:00
dreis2211 cf8a3b3018 Deprecate FlywayMigrationScriptMissingFailureAnalyzer
See gh-25562
2021-03-09 18:02:32 +00:00
Andy Wilkinson 4d97ed19e8 Deprecate support for checking Flyway locations
Closes gh-25488
2021-03-09 15:50:17 +00:00
Andy Wilkinson ed72bca6c8 Provide more pluggable way to indicate DataSource init dependencies
Closes gh-17619
Closes gh-25559
2021-03-09 13:55:48 +00:00
Andy Wilkinson 06b751a0dd Merge branch '2.4.x' 2021-03-09 09:25:55 +00:00
Andy Wilkinson dace7bb742 Merge branch '2.3.x' into 2.4.x 2021-03-09 09:25:45 +00:00
Andy Wilkinson b76a9951e9 Polish RSocketServerAutoConfiguration 2021-03-09 09:25:34 +00:00
Andy Wilkinson 565dc0cc0f Merge branch '2.4.x'
Closes gh-25556
2021-03-09 09:21:53 +00:00
Andy Wilkinson ba5c57c1b2 Merge branch '2.3.x' into 2.4.x
Closes gh-25555
2021-03-09 09:21:38 +00:00
Andy Wilkinson 84637acbdc Make embedded RSocket server back off without spring-web
Fixes gh-25551
2021-03-09 08:53:25 +00:00
Stephane Nicoll adaf2fc57c Merge branch '2.4.x'
Closes gh-25536
2021-03-08 08:48:41 +01:00
dreis2211 b85a50b7b6 Suppress rawtypes warning
See gh-25531
2021-03-08 08:47:16 +01:00
dreis2211 2575621e06 Fix some illegal reflective access warnings
See gh-25531
2021-03-08 08:47:10 +01:00
Andy Wilkinson 6b1bb225b6 Merge branch '2.4.x'
Closes gh-25521
2021-03-05 15:37:47 +00:00
Andy Wilkinson 3c84ea9350 Try to stabilize tests that use Neo4jContainer
Closes gh-25520
2021-03-05 15:36:45 +00:00
Andy Wilkinson 074744aee7 Increase socket timeout for communicating with Elasticsearch
Closes gh-25518
2021-03-05 15:26:51 +00:00
Stephane Nicoll 76d0a7f8ba Merge branch '2.4.x'
Closes gh-25506
2021-03-05 10:03:42 +01:00
dreis2211 89a44f3da4 Fix some assertions
See gh-25499
2021-03-05 09:56:55 +01:00
Andy Wilkinson 96ede9b975 Merge branch '2.4.x'
Closes gh-25491
2021-03-04 13:03:41 +00:00
Andy Wilkinson ca414733f3 Reinstate support for placeholders in @EntityScan
Fixes gh-25436
2021-03-04 12:21:27 +00:00
Stephane Nicoll 782f838074 Polish 2021-03-01 10:00:45 +01:00
Stephane Nicoll 288bece4e9 Polish contribution
See gh-25456
2021-03-01 09:44:20 +01:00
bono007 32caf760b5 Add configuration properties for Flyway's Vault and Conjur support
See gh-25456
2021-03-01 09:23:40 +01:00
Stephane Nicoll e1b1580732 Polish "Allow to configure PersistenceUnitPostProcessor"
This commit updates EntityManagerFactoryBuilder so that persistence unit
post processors can be registered and applied when creating an
EntityManagerFactory.

See gh-25443
2021-02-27 11:33:52 +01:00
johnniang c3c83c8a6c Allow to configure PersistenceUnitPostProcessor
This commit updates EntityManagerFactoryBuilder so that persistence unit
post processors can be registered and applied when creating an
EntityManagerFactory.

See gh-25443
2021-02-27 11:33:39 +01:00
izeye c823f44e76 Polish
See gh-25451
2021-02-27 11:22:05 +01:00
Andy Wilkinson 2a2daae14e Allow user's WebFluxConfigurers to be ordered after auto-config's
Previously, WebFluxAutoConfiguration's WebFluxConfigurer was unordered.
This mean that it had lowest precedence so it was not possible for a
user to provide their own configurer that was guaranteed to run after
the auto-configuration's configurer.

This commit updates the auto-configuration to order its configurer at
0. Any unordered user-defined configurer will now run after the
auto-configuration's configurer.

Closes gh-25302
2021-02-24 11:11:46 +00:00
Stephane Nicoll 9c24ca06ae Polish 2021-02-23 12:46:04 +01:00
Stephane Nicoll d9dcfeba5c Polish "Add more customization options for InfluxDB"
See gh-25319
2021-02-23 11:35:15 +01:00
Eddú Meléndez 8be0b87273 Add more customization options for InfluxDB
This commit augments the configuration properties that are exposed for
InfluxDB, alongside an `InfluxDbCustomizer` that gives more control.

See gh-25319
2021-02-23 11:35:06 +01:00
Phillip Webb a1dc107144 Update copyright year of changed files 2021-02-18 16:23:56 -08:00
Andy Wilkinson 06e36b6bbe Revert "Update code for Spring Data 2021.0.0-M3"
This reverts commit 4b0ef67e8e.

See gh-25004
2021-02-18 09:23:14 +00:00
Andy Wilkinson 6eb51eb2c3 Start building against Spring Data 2020.0.5 snapshots
See gh-25002
2021-02-18 08:32:04 +00:00
Stephane Nicoll 064f6eea33 Merge branch '2.4.x'
Closes gh-25354
2021-02-18 09:28:23 +01:00
Sébastien Deleuze 512efa1687 Refactor CacheConfigurations to avoid storing configuration classes
This commit refactors CacheConfigurations implementation to make
it more native friendly by storing strings instead of classes in
order to avoid loading the configuration classes
when CacheConfigurations is initialized at build time.

See gh-25321
2021-02-18 09:24:54 +01:00
Andy Wilkinson a95e93a8a9 Merge branch '2.4.x'
Closes gh-25347
2021-02-17 17:49:21 +00:00
Andy Wilkinson 08e86741fd Don't scan for `@Persistent` types as they may not be meant for Neo4j
Closes gh-25069
2021-02-17 17:49:12 +00:00
Andy Wilkinson a91f32d14e Temporarily work around breaking API change in Spring Data Couchbase
See gh-25002
2021-02-17 13:47:50 +00:00
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
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
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
Stephane Nicoll e4618cfb8d Delete ErrorProperties.IncludeStacktrace
Closes gh-21286
2020-12-24 10:35:04 +01:00
Stephane Nicoll 1fd17cf641 Add support for Elasticsearch sniffer
Closes gh-24174
2020-12-23 17:11:40 +01:00
Stephane Nicoll ad6b01d6d0 Add control connection timeout property for Cassandra
Closes gh-24189
2020-12-22 15:20:44 +01:00
Stephane Nicoll 5000051891 Merge branch '2.4.x'
Closes gh-24589
2020-12-22 12:32:24 +01:00
Stephane Nicoll 0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j"
See gh-24239
2020-12-22 12:30:48 +01:00
Gerrit Meier ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j
See gh-24239
2020-12-22 12:15:03 +01:00
Stephane Nicoll ec683605d4 Polish "Allow to configure Kafka Listener's onlyLogRecordMetadata"
See gh-24582
2020-12-22 09:53:53 +01:00
Martín Dacosta b539e2e749 Allow to configure Kafka Listener's onlyLogRecordMetadata
See gh-24582
2020-12-22 09:53:07 +01:00
Stephane Nicoll 490a40af20 Polish 2020-12-22 08:33:59 +01:00
Stephane Nicoll 338c8c4fc8 Polish "Allow to configure ActiveMQ Artemis with a broker url"
See gh-24302
2020-12-21 17:53:10 +01:00
Justin Bertram 99b43cb690 Allow to configure ActiveMQ Artemis with a broker url
See gh-24302
2020-12-21 17:32:49 +01:00
Stephane Nicoll a6c6655c82 Polish "Upgrade to Jackson 2.12.0"
Guard breaking change to PropertyNamingStrategies so that we tolerate
older Jackson versions.

See gh-24415
2020-12-21 15:51:52 +01:00
Valery Yatsynovich 1f63b82c5b Upgrade to Jackson 2.12.0
See gh-24415
2020-12-21 15:27:44 +01:00
Stephane Nicoll abbdbb07f6 Polish "Upgrade to Embedded Mongo 3.0.0"
See gh-24254
2020-12-21 10:45:18 +01:00
paulius 2f6b51babd Upgrade to Embedded Mongo 3.0.0
See gh-24254
2020-12-21 10:44:52 +01:00
Phillip Webb 308c2042ee Merge branch '2.4.x' 2020-12-15 19:49:15 -08:00
Phillip Webb 4fba7d0c60 Merge branch '2.3.x' into 2.4.x 2020-12-15 19:48:52 -08:00
Andy Wilkinson fb0f27ce2d Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa
Closes gh-24452
2020-12-15 14:20:50 +00:00
Stephane Nicoll 0dcd9efdac Merge branch '2.4.x'
Closes gh-24509
2020-12-15 11:30:04 +01:00
izeye 8e69a821d5 Use BindResult.orElseGet() where beneficial
See gh-24477
2020-12-15 11:26:15 +01:00
Stephane Nicoll 59910338c9 Polish "Add configuration for Rabbit's key store and trust store algorithm"
See gh-24076
2020-12-15 10:59:39 +01:00
Gong Yi 489062b203 Add configuration for Rabbit's key store and trust store algorithm
See gh-24076
2020-12-15 10:50:17 +01:00
Phillip Webb 72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00
Stephane Nicoll 0d472d6f74 Start building against Spring Data 2020.0.2 snapshots
See gh-24284
2020-12-09 14:16:47 +01:00
Phillip Webb e95c514661 Merge branch '2.3.x'
Closes gh-24412
2020-12-08 17:28:18 -08:00
Phillip Webb 49e754f48b Merge branch '2.2.x' into 2.3.x
Closes gh-24411
2020-12-08 17:23:33 -08:00
Phillip Webb 286ef61071 Narrow auto-configure checkstyle suppressions
Closes gh-21015
2020-12-08 17:04:03 -08:00
Phillip Webb cd5ff6e4af Merge branch '2.3.x'
Closes gh-24404
2020-12-08 12:13:02 -08:00
Phillip Webb 11f285bde5 Merge branch '2.2.x' into 2.3.x
Closes gh-24403
2020-12-08 12:12:51 -08:00
Stephane Nicoll 93d83342d2 Merge branch '2.3.x'
Closes gh-24401
2020-12-08 15:42:52 +01:00
Stephane Nicoll 06671aa50e Stop deferring JPA bootstrap mode by default
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.

Closes gh-24249
2020-12-08 15:42:14 +01:00
Phillip Webb 30c27274e2 Merge branch '2.3.x'
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Phillip Webb 837fc83527 Fix checkstyle header violations
See gh-24337
2020-12-04 18:05:53 -08:00
Andy Wilkinson 4a7bc3d096 Require bean name match for Locale(Context)Resolver to back off
Web MVC and WebFlux look up by name the Locale(Context)Resolver beans
that they use. Previously, the auto-configured resolvers for MVC and
WebFlux would back off when any bean of the required type was defined,
irrespective of its name. If the name of the user's bean didn't match
the name used by MVC and WebFlux to find the custom resolver, the
custom resolver would be ignored and MVC and WebFlux would use their
defaults. There was no indication of this happening in the condition
evaluation report as all it would show is that the auto-configured
resolver had backed off in favour of the custom resolver. It wouldn't
show anything to explain why the custom resolver had not been used.

This commit updates the auto-configured resolvers to be conditional
on a missing bean of the name required by MVC and WebFlux. If the
user then defines a custom resolver with a different name, the
condition evaluation report will show that the auto-configured
resolver remained as the bean name didn't match.

Fixes gh-24209
2020-11-20 10:35:30 +00:00
dreis2211 5ef6e09c64 Fix deprecation warnings in javadoc comments
See gh-24120
2020-11-11 20:09:23 +00:00
Stephane Nicoll b6fc0913cf Merge branch '2.3.x'
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll 515b18e142 Merge branch '2.3.x'
Closes gh-24108
2020-11-10 17:10:26 +01:00
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll 23ad2b4156 Rationalize Testcontainers image versions
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
2020-11-10 16:04:27 +01:00
Brian Clozel 24f29a6516 Polish
See gh-24099
2020-11-10 15:52:17 +01:00
Stephane Nicoll 78fb3ccc53 Polish 2020-11-10 14:12:37 +01:00
Brian Clozel f0a6128db3 Add spring.web.resources.cache.use-last-modified
Prior to this commit, packaging a Spring Boot application as a container
image with Cloud Native Buildpacks could result in unwanted browser
caching behavior, with "Last-Modified" HTTP response headers pointing to
dates in the far past.

This is due to CNB resetting the last-modified date metadata for static
files (for build reproducibility and container layer caching) and Spring
static resource handling relying on that information when serving static
resources.

This commit introduces a new configuration property
`spring.web.resources.cache.use-last-modified` that can be used to
disable this behavior in Spring if the application is meant to run as a
container image built by CNB.

The default value for this property remains `true` since this remains
the default value in Spring Framework and using that information in
other deployment models is a perfectly valid use case.

Fixes gh-24099
2020-11-10 13:40:25 +01:00
Stephane Nicoll 45f1133e1e Merge branch '2.3.x' 2020-11-10 09:49:49 +01:00