root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
36,672 Commits 24 Branches 345 Tags 276 MiB
Commit Graph

3320 Commits

Author SHA1 Message Date
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4 
Closes gh-28697
 2021-11-16 11:02:02 +01:00
Filip Hrisafov d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available 
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
 2021-11-15 09:59:20 +01:00
Stephane Nicoll 6e06e69bba Merge branch '2.5.x' 
Closes gh-28673
 2021-11-14 08:25:01 +01:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x 
Closes gh-28672
 2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file 
See gh-28532
 2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition 
See gh-28532
 2021-11-14 08:19:43 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x' 
Closes gh-28662
 2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x 
Closes gh-28661
 2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters 
Closes gh-28658
 2021-11-12 20:04:35 +00:00
Andy Wilkinson 925ddd6b09 Merge branch '2.5.x' 2021-11-11 10:34:13 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x' 
Closes gh-28607
 2021-11-11 09:55:42 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28606
 2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI 
Closes gh-28594
 2021-11-11 09:54:50 +00:00
Andy Wilkinson ceacb1533a Merge branch '2.5.x' 2021-11-10 20:18:09 +00:00
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 2021-11-10 20:17:36 +00:00
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering 
See gh-28506
 2021-11-10 20:15:56 +00:00
Stephane Nicoll 629e1d3ac5 Upgrade to Flyway 8.0.3 
Closes gh-28572
 2021-11-09 08:51:38 +01:00
Stephane Nicoll bf88405121 Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure 
Closes gh-28540
 2021-11-05 14:20:37 +01:00
Stephane Nicoll 11a5055b8f Merge branch '2.5.x' 2021-11-05 13:45:01 +01:00
Stephane Nicoll cd5508a679 Polish 2021-11-05 13:43:38 +01:00
Stephane Nicoll 98b9e1ab21 Start building against Spring Framework 5.3.13 snapshots 
See gh-28515
 2021-11-05 13:37:29 +01:00
izeye 5d8dce70dc Polish 
See gh-28494
 2021-11-01 08:58:40 +01:00
Andy Wilkinson ef2bcdd3ed Merge branch '2.5.x' 
Closes gh-28483
 2021-10-29 11:37:43 +01:00
Andy Wilkinson 07ed7ab944 Merge branch '2.4.x' into 2.5.x 
Closes gh-28482
 2021-10-29 11:37:33 +01:00
Andy Wilkinson 2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default 
Closes gh-28481
 2021-10-29 11:23:35 +01:00
Andy Wilkinson c9dd6b7e86 Merge branch '2.5.x' 
Closes gh-28480
 2021-10-29 11:12:18 +01:00
Andy Wilkinson ae93bb3a11 Merge branch '2.4.x' into 2.5.x 
Closes gh-28479
 2021-10-29 11:12:04 +01:00
Andy Wilkinson 10f0017d69 Fix method validation in child contexts 
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
 2021-10-29 10:08:57 +01:00
Stephane Nicoll 9241f228d5 Add .gitattributes 
Closes gh-28474
 2021-10-28 15:31:40 +02:00
Stephane Nicoll 66553ac8c7 Add .gitattributes 
Closes gh-28473
 2021-10-28 15:27:49 +02:00
Stephane Nicoll 1b3f52d609 Harmonize line endings 
See gh-27615
 2021-10-28 15:22:57 +02:00
Stephane Nicoll 837e2ac277 Fix bean type visibility 
Closes gh-28437
 2021-10-23 07:31:27 +02:00
Andy Wilkinson 3605388787 Merge branch '2.5.x' 
Closes gh-28440
 2021-10-22 15:24:13 +01:00
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x 
Closes gh-28439
 2021-10-22 15:23:07 +01:00
Andy Wilkinson a545b6e0b4 Polish "Polish" 
See gh-28367
 2021-10-22 15:19:13 +01:00
Leo Li 1586232761 Polish 
See gh-28367
 2021-10-22 15:11:57 +01:00
Andy Wilkinson 47da70632f Merge branch '2.5.x' 
Closes gh-28430
Closes gh-28431
 2021-10-22 10:12:53 +01:00
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-22 10:10:50 +01:00
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages" 
See 2f6651c3cb.

Closes gh-28408
 2021-10-22 10:08:27 +01:00
Phillip Webb e25f216eab Merge branch '2.5.x' 
Closes gh-28425
 2021-10-21 11:28:33 -07:00
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-21 11:27:29 -07:00
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages 
Closes gh-28408
 2021-10-21 11:24:54 -07:00
Andy Wilkinson 2541c0cbdc Disable on Windows tests that use embedded Kafka 
Closes gh-28406
 2021-10-21 10:46:50 +01:00
Phillip Webb 1ad39b5fce Fix ReactiveSessionAutoConfigurationRedisTests 
See gh-26714
 2021-10-21 00:10:40 -07:00
Phillip Webb cf9156e497 Add SameSite cookie support for servlet web servers 
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.

The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.

Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.

Closes gh-20971

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
 2021-10-20 22:58:31 -07:00
Phillip Webb b72ff25220 Relocate and unify reactive cookie properties 
Relocate the recently introduced `spring.webflux.session` properties
to `server.reactive.session` and create a unified `Cookie` properties
class.

Reactive session properties now mirror the existing
`server.servlet.session` properties and better reflect the fact that
they are related to the server and not just for WebFlux.

See gh-26714
 2021-10-20 22:09:33 -07:00
Phillip Webb 3c71637fa2 Polish 'Add more session properties for reactive web servers' 
See gh-26714
 2021-10-20 22:09:30 -07:00
weixsun a2a802a14a Add more session properties for reactive web servers 
Expand the session properties supported by reactive web servers to
include `timeout` support and additional `cookie` properties.

See gh-26714
 2021-10-20 22:09:21 -07:00
Madhura Bhave ea65c28bfa Polish 2021-10-20 19:45:46 -07:00
Madhura Bhave 07aeb2156d Merge pull request #28123 from timtebeek 
* pr/28123:
  Polish "Support PEM format for Kafka SSL certs and private key"
  Support PEM format for Kafka SSL certs and private key

Closes gh-28123
 2021-10-20 19:38:11 -07:00
Madhura Bhave 0d06a2854d Polish "Support PEM format for Kafka SSL certs and private key" 
See gh-28123
 2021-10-20 17:10:49 -07:00
Tim te Beek 7a98364a23 Support PEM format for Kafka SSL certs and private key 
See gh-28123
 2021-10-20 17:10:13 -07:00
Andy Wilkinson f2b3f1f41f Make URL- and property-based pooling config mutually exclusive 
Closes gh-28144
 2021-10-20 11:22:05 +01:00
Andy Wilkinson 9d6a0cfd24 Starting building against Spring Framework 5.3.12 snapshots 
This reverts commit 3969e63ced, reversing
changes made to f01d086a8d.

Closes gh-28385
See gh-28252
 2021-10-19 18:43:53 +01:00
Andy Wilkinson f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots 
This reverts commit 196013fc39, reversing
changes made to 8b0c563832.

Closes gh-28384
See gh-28241
 2021-10-19 18:41:23 +01:00
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots 
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
 2021-10-19 17:50:59 +01:00
Andy Wilkinson 9b77151caa Polish "Make UserDetailsService back off with AuthManagerResolver bean" 
See gh-28361
 2021-10-19 16:30:06 +01:00
Bartosz Jaszczak 31cdfd524e Make UserDetailsService back off with AuthManagerResolver bean 
See gh-28361
 2021-10-19 16:19:12 +01:00
Andy Wilkinson a27dfcb9b0 Make R2DBC auto-config back off without a connection provider 
Closes gh-26439
 2021-10-19 14:18:34 +01:00
Andy Wilkinson 2af2a02fbb Merge branch '2.5.x' 
Closes gh-28380
 2021-10-19 14:18:12 +01:00
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x 
Closes gh-28379
 2021-10-19 14:17:53 +01:00
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC 
Fixes gh-28378
 2021-10-19 13:52:45 +01:00
Andy Wilkinson 657eb86dad Polish "Add a config prop to enable/disable SI's default logging" 
See gh-28355
 2021-10-19 11:04:32 +01:00
Artem Bilan c6891c5184 Add a config prop to enable/disable SI's default logging 
See gh-28355
 2021-10-19 11:04:32 +01:00
Andy Wilkinson 3969e63ced Merge branch '2.5.x' 
See gh-28252
 2021-10-18 10:37:09 +01:00
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x 
See gh-28241
 2021-10-18 10:23:31 +01:00
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC 
See gh-28223
 2021-10-18 10:15:53 +01:00
Stephane Nicoll 0b32215c13 Polish "Log URLs for all DataSources" 
See gh-28204
 2021-10-14 09:24:07 +02:00
StitzL f31b8ec226 Log URLs for all DataSources 
This commit logs the path of the H2 console, followed by the
comma-separated ordered URLs of each data source that offers a
connection.

See gh-28204
 2021-10-14 09:17:49 +02:00
Phillip Webb 2034ad4827 Merge branch '2.5.x' 2021-10-13 18:48:18 -07:00
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb 0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Phillip Webb 9abf9e6731 Modify more tests for static resource location filtering 
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
 2021-10-13 18:45:22 -07:00
Andy Wilkinson b0dfca7d92 Configure Flyway with spring.flyway.script-placeholder-suffix 
Fixes gh-28307
 2021-10-13 10:57:21 +01:00
Andy Wilkinson 84b553a8ca Upgrade to Jackson Bom 2.13.0 
Closes gh-28298
 2021-10-13 10:32:17 +01:00
Andy Wilkinson 509427b671 Upgrade to Flyway 8.0.0 
Closes gh-28296
 2021-10-13 10:16:50 +01:00
Stephane Nicoll e978654c88 Polish "Fix Integration `fixedRate` property setting" 
See gh-28237
 2021-10-13 09:03:07 +02:00
Artem Bilan 769b5039b6 Fix Integration `fixedRate` property setting 
The `spring.integration.poller.fixed-rate` property must be set to the
constructor of the `PeriodicTrigger` and its `fixedRate` flag should be
set to `true`. The current code-base has it exactly opposite: the flag
is set to `true` when `fixed-delay` is provided.

* Fix `IntegrationAutoConfiguration.asTrigger()` method for the proper
`fixedRate` setting logic.
* Cover the change with a new test-case
* Add a message handling verification to the `defaultPoller()` test to
be sure that poller auto-configuration works as it is claimed.

See gh-28237
 2021-10-13 09:03:07 +02:00
Scott Frederick 3c9354305a Merge branch '2.5.x' 
Closes gh-28305
 2021-10-12 18:09:32 -05:00
Scott Frederick f427ea5802 Merge branch '2.4.x' into 2.5.x 
Closes gh-28304
 2021-10-12 18:00:15 -05:00
Scott Frederick 3d21ac7a20 Add required id field to Spring Data Neo4j test class 
Fixes gh-28303
 2021-10-12 17:59:19 -05:00
Scott Frederick a74b911870 Merge branch '2.5.x' 2021-10-12 16:46:19 -05:00
Scott Frederick 3755c563df Merge branch '2.4.x' into 2.5.x 2021-10-12 16:45:51 -05:00
Scott Frederick 3c6e061917 Remove unused import 
See gh-28223
 2021-10-12 16:45:43 -05:00
Scott Frederick 604b4a004d Merge branch '2.5.x' 2021-10-12 16:18:21 -05:00
Scott Frederick ec6bfa8062 Merge branch '2.4.x' into 2.5.x 2021-10-12 16:17:48 -05:00
Scott Frederick 207b76c39e Modify tests to expect filtering of static resource locations 
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.

See gh-28223
 2021-10-12 16:17:16 -05:00
Madhura Bhave e571894903 Merge pull request #28169 from Pooja199 
* pr/28169:
  Auto-configure JwtSupplierDecoder to defer OIDC lookup

Closes gh-28169
 2021-10-06 16:40:05 -07:00
Anjee 4e9f536a8e Auto-configure JwtSupplierDecoder to defer OIDC lookup 
See gh-28169
 2021-10-06 16:39:26 -07:00
Andy Wilkinson 1a505964ee Merge branch '2.5.x' 
Closes gh-28207
 2021-10-06 10:03:24 +01:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x 
Closes gh-28206
 2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29 
Closes gh-28205
 2021-10-06 09:52:45 +01:00
Andy Wilkinson bddfe9ef6e Merge branch '2.5.x' 
See gh-28135
 2021-10-01 11:32:59 +01:00
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x 
See gh-28134
 2021-10-01 11:32:22 +01:00
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses 
Closes gh-28133
 2021-10-01 11:30:11 +01:00
Stephane Nicoll 14fc0f78b2 Polish "Stop considering persistent when scanning for Couchbase entities" 
See gh-28124
 2021-10-01 08:31:14 +02:00
Dąbrowski 067b349fb1 Stop considering persistent when scanning for Couchbase entities 
See gh-28124
 2021-10-01 08:28:36 +02:00
Phillip Webb ca69c8b98c Merge branch '2.5.x' 
Closes gh-28135
 2021-09-26 13:06:35 -07:00
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28134
 2021-09-26 13:06:14 -07:00
Phillip Webb 01a39aaf6a Support IPv6 addresses in spring.rabbitmq.addresses 
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.

Fixes gh-28133
 2021-09-26 13:05:17 -07:00
Andy Wilkinson ab95c2fa3b Polish descriptions of spring.integration.poller properties 
Closes gh-28126
 2021-09-24 10:09:18 +01:00
Andy Wilkinson 3274e24d55 Polish "Add Spring Integration default poller auto-config" 
See gh-27992

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-09-23 16:20:13 -07:00
Artem Bilan b2d1423e34 Add Spring Integration default poller auto-config 
When polling consumers or source polling channel adapters are used in
Spring Integration applications, they require some polling policy to
be configured.

This comment auto-configures a PollerMetadata bean which customized
via newly added `spring.integration.poller.*` configuration
properties or overriden completely be user-defined bean.

See gh-27992
 2021-09-23 16:20:13 -07:00
Andy Wilkinson 342c749784 Polish 2021-09-22 20:28:31 +01:00
Andy Wilkinson 4fa61cbc60 Merge branch '2.5.x' 2021-09-22 18:37:11 +01:00
Andy Wilkinson 2ba593328f Order detector for AbstractDataSourceInitializers 
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
 2021-09-22 18:30:44 +01:00
Stephane Nicoll 233b63199c Polish "Clarify pooling is implicitly enabled in Sentinel mode" 
See gh-27891
 2021-09-22 11:52:46 +02:00
weixsun d39b7cc46d Clarify pooling is implicitly enabled in Sentinel mode 
See gh-27891
 2021-09-22 11:48:36 +02:00
Phillip Webb 667e5ca30c Polish 2021-09-21 14:45:01 -07:00
Phillip Webb 55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
Stephane Nicoll e0465f7357 Use RootBeanDefinition consistently 
Closes gh-28077
 2021-09-21 16:36:45 +02:00
Stephane Nicoll 124c3ac07c Polish "Add support for used-defined RedisStandaloneConfiguration" 
See gh-28028
 2021-09-21 08:34:44 +02:00
Eddú Meléndez 236c2dd0da Add support for used-defined RedisStandaloneConfiguration 
See gh-28028
 2021-09-21 08:22:41 +02:00
Stephane Nicoll 3e5038cddd Merge branch '2.5.x' 
Closes gh-28073
 2021-09-21 08:19:58 +02:00
Stephane Nicoll 4ee249c700 Merge branch '2.4.x' into 2.5.x 
Closes gh-28072
 2021-09-21 08:18:39 +02:00
Stephane Nicoll 15de85d89a Polish contribution 
See gh-28061
 2021-09-21 08:18:08 +02:00
Leo Li 0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints" 
See gh-28061
 2021-09-21 08:12:21 +02:00
dreis2211 cf0fcafd13 Polish 
See gh-27940
 2021-09-21 08:08:29 +02:00
Andy Wilkinson 808aa77747 Provide a config prop for Elasticsearch client's path prefix 
Closes gh-25010
 2021-09-20 15:09:10 +01:00
Andy Wilkinson e2a355f003 Consolidate Elasticsearch configuration properties 
Previously, a number of Elasticsearch properties were duplicated
across the spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive prefixes for configuring
the blocking REST client provided by Elasticsearch and the reactive
client provided by Spring Data respectively. This could cause
problems when using the Elasticsearch REST client configured with
a custom spring.elasticsearch.rest.uris. If Spring WebFlux (to make
use of WebClient) and Spring Data Elasticsearch were on the classpath,
the reactive Elasticsearch Client would be autoconfigured but it
would use the default value of its analogous
spring.data.elasticsearch.client.reactive.endpoints property. It
would be unable to connect, causing a startup failure.

This commit consoliates the configuration properties where possible.
Each setting that is common across the two clients is now configured
using a single, shared spring.elasticsearch property. Each setting
that is specific to the blocked REST client or the WebClient-based
reactive client now have prefixes of spring.elasticsearch.restclient
and spring.elasticsearch.webclient respectively.

The old properties beneath spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive have been deprecated. If a
any deprecated property is set, all of the new properties are
ignored. In other words, to migrate to the new properties, each usage
of a now-deprecated property must be updated to use its new
replacement instead.

Closes gh-23106
 2021-09-20 14:37:44 +01:00
Andy Wilkinson 30815cc0e0 Upgrade to Spring Data 2021.1.0-M3 
Closes gh-27932
 2021-09-17 15:56:57 +01:00
Andy Wilkinson 74eed94a14 Upgrade to Thymeleaf Layout Dialect 3.0.0 
Closes gh-28057
 2021-09-17 15:56:57 +01:00
Andy Wilkinson 7924d1fc18 Upgrade to Flyway 7.15.0 
Closes gh-28049
 2021-09-17 13:57:21 +01:00
Andy Wilkinson 5857bcccc6 Merge branch '2.5.x' 
Closes gh-28048
 2021-09-17 13:20:30 +01:00
Andy Wilkinson 8364840cd5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28047
 2021-09-17 12:25:13 +01:00
Andy Wilkinson eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config 
Closes gh-28038
 2021-09-17 12:00:45 +01:00
Stephane Nicoll 599cc1f696 Start building against Spring Data 2021.1.0-M3 snapshots 
See gh-27932
 2021-09-11 08:59:12 +02:00
Stephane Nicoll 78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler" 
See gh-27927
 2021-09-10 08:20:10 +02:00
Gary Russell c3583a4b06 Auto-Configure Kafka CommonErrorHandler 
`ErrorHandler/BatchErrorHandler` will be deprecated in a future release
in favor of `CommonErrorHandler`. Currently, the legacy handlers are
adapted to a `CommonErrorHandler` or ignored if a `CommonErrorHandler`
is configured.

See gh-27927
 2021-09-10 08:16:29 +02:00
dreis2211 e1afc91ae2 Polish javadoc comments 
See gh-27925
 2021-09-10 07:53:49 +02:00
Andy Wilkinson bb11abef2c Merge branch '2.5.x' 
Closes gh-27923
 2021-09-09 16:12:45 +01:00
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27922
 2021-09-09 16:12:25 +01:00
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration 
Closes gh-27919
 2021-09-09 16:12:09 +01:00
Andy Wilkinson 8ab9dbad7a Merge branch '2.5.x' 
Closes gh-27913
 2021-09-09 14:40:57 +01:00
Andy Wilkinson 128f54fbd0 Merge branch '2.4.x' into 2.5.x 
Closes gh-27911
 2021-09-09 14:40:40 +01:00
Andy Wilkinson 11c79ac650 Move Docker-based reactive Elasticsearch test into separate class 
Closes gh-27907
 2021-09-09 14:39:52 +01:00
Andy Wilkinson 010d201002 Merge branch '2.5.x' 
Closes gh-27906
 2021-09-09 13:38:38 +01:00
Andy Wilkinson 7afaffb80e Merge branch '2.4.x' into 2.5.x 
Closes gh-27905
 2021-09-09 13:38:09 +01:00
Andy Wilkinson 1f2035ae64 Move Docker-based Elasticsearch test into separate class 
Closes gh-27904
 2021-09-09 13:24:26 +01:00
Madhura Bhave 393081f2e6 Enable PathPattern based matching for MVC actuators 
Closes gh-24645
 2021-09-08 16:23:16 -07:00
Stephane Nicoll aa24476559 Update copyright year of changed files 
See gh-27838
 2021-09-05 17:10:10 +02:00
Yanming Zhou 168688ef49 Simplify code 
See gh-27838
 2021-09-05 17:08:33 +02:00
Madhura Bhave 2d89a8253c Switch default MVC path matching strategy" 
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
 2021-09-02 11:50:35 -07:00
weixsun 149ed09230 Polish SessionAutoConfiguration#addCandidateIfAvailable 
See gh-27808
 2021-08-24 07:24:23 +02:00
Andy Wilkinson fd2fbcb3c6 Merge branch '2.5.x' 
Closes gh-27758
 2021-08-18 18:28:34 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27757
 2021-08-18 17:56:32 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes" 
See gh-27736
 2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes 
See gh-27736
 2021-08-18 17:38:40 +01:00
Andy Wilkinson 2dfdcf5e88 Merge branch '2.5.x' 
Closes gh-27754
 2021-08-18 13:52:23 +01:00
Stephane Nicoll 456d741706 Add support for configuring Jackson's ConstructorDetector 
Closes gh-27178
 2021-08-17 14:15:08 +02:00
Stephane Nicoll 68a47a7f11 Polish "Add property to customize Jackson's default leniency" 
See gh-27659
 2021-08-16 09:03:50 +02:00
Lovekesh Garg 89c532ab70 Add property to customize Jackson's default leniency 
See gh-27659
 2021-08-16 08:57:13 +02:00
Andy Wilkinson 42fb40b202 Upgrade to Flyway 7.13.0 
Closes gh-27644
 2021-08-12 17:18:29 +01:00
Andy Wilkinson fe17be16e9 Upgrade to Commons Pool2 2.11.0 
Closes gh-27642
 2021-08-12 13:52:22 +01:00
Andy Wilkinson 7a0fe0f95f Polish "Add auto-configuration for spring-rabbit-stream" 
See gh-27480
 2021-08-11 13:19:15 +01:00
Gary Russell 9784838229 Add auto-configuration for spring-rabbit-stream 
See gh-27480
 2021-08-11 12:05:59 +01:00
Andy Wilkinson 0ed9085ba2 Polish "Apply container customizer bean to AMQP MessageListenerContainer" 
See gh-27625
 2021-08-11 11:47:03 +01:00
Gary Russell 774941e958 Apply container customizer bean to AMQP MessageListenerContainer 
See gh-27625
 2021-08-11 11:18:16 +01:00
Stephane Nicoll a4eda34170 Start building against Spring Kafka 2.8.0-M2 snapshots 
See gh-27609
 2021-08-10 09:24:01 +02:00
Brian Clozel a1fe82c3dd Fix formatting 2021-08-02 16:54:25 +02:00
Brian Clozel e48cb12252 Polish "Add spring.webflux.multipart configuration properties" 
See gh-26254
 2021-08-02 15:40:42 +02:00
bono007 4c0b6304ac Add spring.webflux.multipart configuration properties 
See gh-26254
 2021-08-02 15:40:42 +02:00
Andy Wilkinson 2482607a06 Merge branch '2.5.x' 
Closes gh-27526
 2021-07-29 17:42:40 +01:00
Andy Wilkinson 533bb24b55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27525
 2021-07-29 17:42:26 +01:00
Andy Wilkinson ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time 
Closes gh-27524
 2021-07-29 17:33:56 +01:00
Andy Wilkinson 621844abda Polish "Use MessageSource to interpolate bean validation messages" 
See gh-17530
 2021-07-26 12:10:15 +01:00
Dmytro Nosan bbb8367afb Use MessageSource to interpolate bean validation messages 
See gh-17530
 2021-07-26 12:10:15 +01:00
Andy Wilkinson 355226c21e Merge branch '2.5.x' 
Closes gh-27474
 2021-07-23 13:09:37 +01:00
Andy Wilkinson eaca9c7a83 Merge branch '2.4.x' into 2.5.x 
Closes gh-27473
 2021-07-23 13:09:27 +01:00
Andy Wilkinson ee07d6c3ca Increase response timeout for server-bound WebTestClients 
Closes gh-27472
 2021-07-23 13:06:25 +01:00
Phillip Webb 7e9ac39f0d Update copyright year of changed files 2021-07-22 09:50:37 -07:00
Andy Wilkinson 37f690323f Polish 
Closes gh-27432
 2021-07-21 11:55:38 +01:00
Andy Wilkinson 668f45f0e8 Polish "Make RabbitTemplateConfigurer's setters public" 
See gh-27376
 2021-07-20 14:59:24 +01:00
bono007 ce87928170 Make RabbitTemplateConfigurer's setters public 
See gh-27376
 2021-07-20 14:58:06 +01:00
Andy Wilkinson 6e7e72a481 Remove redundant deprecation suppressions 
Closes gh-27415
 2021-07-20 14:55:06 +01:00
dreis2211 f0df9671cd Remove redundant deprecation suppressions 
See gh-27409
 2021-07-20 14:53:28 +01:00
Andy Wilkinson ed38ac6ff0 Polish "Add idle timeout property for Reactor Netty" 
See gh-27371
 2021-07-19 14:58:15 +01:00
Saraswathy Hariharakrishnan cbcd7b939b Add idle timeout property for Reactor Netty 
See gh-27371
 2021-07-19 14:49:08 +01:00
Andy Wilkinson 51fedd6528 Reinstate support for Hibernate < 5.5 
See gh-27352
 2021-07-19 13:52:40 +01:00
Andy Wilkinson 6d50e65572 Revert "Add support for InfluxDB 2.x" 
This reverts commit 52fedb2bb4.

See gh-25891
 2021-07-19 13:28:08 +01:00
Andy Wilkinson 4d30eb453f Adopt Hiberate's CamelCaseToUnderscoresNamingStrategy 
Closes gh-27352
 2021-07-19 13:19:49 +01:00
Andy Wilkinson 069074e490 Make ConnectionNameStrategy publicly settable 
See gh-26982
 2021-07-19 11:57:47 +01:00
Andy Wilkinson bc8ab6c755 Merge branch '2.5.x' 
Closes gh-27362
 2021-07-16 09:43:55 +01:00
Andy Wilkinson 1e09ef1db3 Merge branch '2.4.x' into 2.5.x 
Closes gh-27361
 2021-07-16 09:43:33 +01:00
Andy Wilkinson fe081b1742 Add Gson converter immediately before default Jackson converter 
Previously, when the preferred json mapper was set to Gson, the Gson
HTTP message converter was added before any other converters. This
changed the form of String responses that were already valid. When
Jackson is in use, a string converter is used as it appears earlier
in the list than the Jackson converter. When the mapper is switched
to Gson, the Gson converter is added first in the list of converters
and the Strong converter is no longer used. This results in the
String, that was already valid JSON, being converted again. This
changes its form as quotes are escaped, etc.

This commit updates HttpMessageConverters so that the Gson converter
is added to the list immediately before the default Jackson
converter. This is done by considering the Gson converter to be an
equivalent of the Jackson converter.

Fixes gh-27354
 2021-07-16 09:04:46 +01:00
Madhura Bhave 7bae960d78 Polish "Support comma-separated basePackage values in EntityScan" 
See gh-27355
 2021-07-15 15:42:42 -07:00
Saraswathy Hariharakrishnan 00b9a8811d Support comma-separated basePackage values in EntityScan 
See gh-27355
 2021-07-15 15:41:50 -07:00
izeye 198e40c72e Remove Flyway references from DependsOn BFPPs for Liquibase 
See gh-27348
 2021-07-15 20:18:27 +01:00
Andy Wilkinson c00e885ac4 Work around compile warnings from Data Neo4j's use of API Guardian 
See gh-27170
 2021-07-14 18:28:24 +01:00
Andy Wilkinson 8db63db564 Merge branch '2.5.x' 
Closes gh-27333
 2021-07-14 17:19:59 +01:00
Andy Wilkinson 9a81d2fe09 Merge branch '2.4.x' into 2.5.x 
Closes gh-27332
 2021-07-14 17:19:39 +01:00
Andy Wilkinson c005e1de9a Rename test classes to match our naming conventions 
Closes gh-27331
 2021-07-14 17:19:11 +01:00
Stephane Nicoll 36beca2c7d Add ERROR-level metadata for removed properties 
See gh-27303
 2021-07-14 14:58:52 +02:00
Andy Wilkinson c406dda181 Deprecate AbstractDataSourceInitializer 
Closes gh-27206

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-07-14 13:39:14 +01:00
Stephane Nicoll dc5acb0019 Remove deprecated code flagged for removal 
Closes gh-27303
 2021-07-14 11:50:01 +02:00
Andy Wilkinson 06e08e9fb5 Pass required settings into RabbitTemplateConfigurer's constructor 
Closes gh-27313
 2021-07-13 18:19:27 +01:00
Andy Wilkinson e6141c04f6 Pass required settings into Rabbit LCF configurer's constructor 
Closes gh-27311
 2021-07-13 18:17:07 +01:00
Andy Wilkinson 2c8658c24f Polish "Add Rabbit connection factory configurers" 
See gh-26982
 2021-07-13 17:44:56 +01:00
bono007 a96b3ef101 Add Rabbit connection factory configurers 
See gh-26982
 2021-07-13 17:44:56 +01:00
Andy Wilkinson 4d76660f17 Polish "Remove default spring.mongodb.embedded.version" 
See gh-27108
 2021-07-13 10:46:46 +01:00
bono007 d16ecab24b Remove default spring.mongodb.embedded.version 
See gh-27108
 2021-07-13 10:13:54 +01:00
Stephane Nicoll 8b732a9c33 Upgrade to Flyway 7.11.1 
Closes gh-27290
 2021-07-12 09:43:55 +02:00
Stephane Nicoll c16ef0a006 Upgrade to Neo4j Java Driver 4.3.3 
Closes gh-27278
 2021-07-12 09:13:10 +02:00
Stephane Nicoll f4cc3010de Upgrade to Commons Pool2 2.10.0 
Closes gh-27256
 2021-07-12 08:46:16 +02:00
Andy Wilkinson 7b0cc3afb5 Merge branch '2.5.x' 
Closes gh-27227
 2021-07-09 15:05:44 +01:00
Andy Wilkinson 1cd3a54e88 Rework Quartz DB init dependencies to use a detector 
Closes gh-27222
 2021-07-09 15:02:15 +01:00
Andy Wilkinson 7a1c923fec Merge branch '2.5.x' 
Closes gh-27226
 2021-07-09 14:18:18 +01:00
Andy Wilkinson 3de58c2340 Detect JdbcIndexedSessionRepository as depending on DB init 
Fixes gh-27220
 2021-07-09 14:17:23 +01:00
Andy Wilkinson 0b604f5e3b Merge branch '2.5.x' 
Closes gh-27224
 2021-07-09 13:47:41 +01:00
Andy Wilkinson f008228f1a Polish "Detect JobRepository as depending on DB init" 
See gh-27221
 2021-07-09 12:36:30 +01:00
Henning Pöttker cf69785393 Detect JobRepository as depending on DB init 
See gh-27221
 2021-07-09 12:36:19 +01:00
Andy Wilkinson 7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed 
Fixes gh-27208
 2021-07-09 11:12:52 +01:00
Andy Wilkinson 4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers 
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
 2021-07-09 10:29:50 +01:00
Andy Wilkinson 3fec41104e Ensure that Batch schema is in place before DB is accessed 
Fixes gh-27193
 2021-07-09 09:47:48 +01:00
Stephane Nicoll 786d7cdb6e Merge branch '2.5.x' 
Closes gh-27118
 2021-06-29 09:09:14 +02:00
Stephane Nicoll ddf76c32c6 Update copyright year of updated file 
See gh-27085
 2021-06-29 08:28:08 +02:00
dreis2211 c852961011 Avoid reflection in tests 
See gh-27085
 2021-06-29 08:25:45 +02:00
Brian Clozel f23fa2821c Merge branch '2.5.x' 
Closes gh-27106
 2021-06-25 19:38:39 +02:00
Brian Clozel 4db53601b5 Fix spring.netty.leak-detection metadata 
Fixes gh-27104
 2021-06-25 19:38:07 +02:00
Andy Wilkinson d56ddb0f60 Merge branch '2.5.x' 
See gh-27050
 2021-06-24 11:21:30 +01:00
Andy Wilkinson 4572ae5430 Use reflection to extract Netty's default level 
See gh-27046
 2021-06-24 11:20:56 +01:00
Phillip Webb 6b241d04c0 Merge branch '2.5.x' 
Closes gh-27063
 2021-06-23 21:13:18 -07:00
Phillip Webb 093e7f7e3b Merge branch '2.4.x' into 2.5.x 
Closes gh-27062
 2021-06-23 21:13:08 -07:00
Phillip Webb 1a7569056b Fix 'spring.datasource.name' property description 
Closes gh-27026
 2021-06-23 21:12:59 -07:00
Phillip Webb 6102f10639 Merge branch '2.5.x' 2021-06-23 21:02:36 -07:00
Brian Clozel 7d720a63a5 Merge branch '2.5.x' 
Closes gh-27050
 2021-06-23 19:39:03 +02:00
Brian Clozel bf17f50a1f Align NettyProperties with Netty's defaults 
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.

This commit changes the default configuration property value and ensures
that both stay in sync.

Fixes gh-27046
 2021-06-23 19:36:40 +02:00
Stephane Nicoll 49951e8be1 Merge branch '2.5.x' 
Closes gh-27012
 2021-06-22 08:26:33 +02:00
dreis2211 03cd6bec6e Avoid illegal reflective access in RabbitAutoConfigurationTests 
See gh-26954
 2021-06-22 08:22:48 +02:00
Andy Wilkinson 76ac18f282 Merge branch '2.5.x' 
Closes gh-26929
 2021-06-16 13:06:44 +01:00
Andy Wilkinson bc7004d9c6 Fix WebSocket support with Jetty 10.0.x 
Fixes gh-26847
 2021-06-16 12:38:33 +01:00
Andy Wilkinson 63976367be Merge branch '2.5.x' 
Closes gh-26918
 2021-06-15 22:21:34 +01:00
Andy Wilkinson 2c2ab69315 Merge branch '2.4.x' into 2.5.x 
Closes gh-26917
 2021-06-15 22:20:52 +01:00
Andy Wilkinson a1e279f736 Make Flyway and Liquibase auto-config back off without spring-jdbc 
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.

This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.

Closes gh-26849
 2021-06-15 22:00:11 +01:00
Stephane Nicoll 52fedb2bb4 Add support for InfluxDB 2.x 
Closes gh-25891
 2021-06-15 08:21:37 +02:00
Stephane Nicoll a0cf1eed41 Add support for customizing the auto-configured ClientResources 
Closes gh-26792
 2021-06-14 09:32:43 +02:00
Stephane Nicoll 6505e03cb2 Polish "Add auto-configuration for Spring Data Envers" 
See gh-22610
 2021-06-14 08:28:17 +02:00
Stefano Cordio 91da8c9fc6 Add auto-configuration for Spring Data Envers 
See gh-22610
 2021-06-14 08:28:16 +02:00
Stephane Nicoll d17c475504 Polish "Enable Redis connection pool if commons-pool2 is available" 
See gh-26326
 2021-06-14 08:25:21 +02:00
weixsun 55ff163018 Enable Redis connection pool if commons-pool2 is available 
See gh-26326
 2021-06-14 08:25:21 +02:00
Stephane Nicoll 05acfaa690 Polish "Upgrade to Flyway 7.9.2" 
See gh-26456
 2021-06-14 08:22:09 +02:00
Kedar Joshi e6236b76bb Upgrade to Flyway 7.9.2 
See gh-26456
 2021-06-14 08:22:01 +02:00
Stephane Nicoll fc0438eda8 Polish "Allow direct use of exposed WebSessionIdResolver bean" 
See gh-26437
 2021-06-14 08:13:58 +02:00
weixsun 65ce1454e0 Allow direct use of exposed WebSessionIdResolver bean 
See gh-26437
 2021-06-14 08:13:58 +02:00
Stephane Nicoll 6b4efcce11 Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder" 
See gh-26341
 2021-06-12 17:51:57 +02:00
nguyensach 850c653862 Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder 
See gh-26341
 2021-06-12 17:51:57 +02:00
Stephane Nicoll d847f4c69e Polish "Add configuration property for Tomcat's rejectIllegalHeader" 
See gh-26311
 2021-06-12 17:27:11 +02:00
David Byron e5a539d80e Add configuration property for Tomcat's rejectIllegalHeader 
See gh-26311
 2021-06-12 17:27:10 +02:00
Andy Wilkinson 39aa27e13c Make DB init back off without DatabasePopulator 
Fixes gh-26850
 2021-06-10 11:27:25 +01:00
Andy Wilkinson 46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning 
See gh-26682
 2021-06-09 19:11:20 +01:00
Stephane Nicoll 8590eccac4 Polish 
See gh-26682
 2021-06-09 14:47:54 +02:00
Phillip Webb f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb 9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Phillip Webb b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder 
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
 2021-06-08 15:44:01 -07:00
Phillip Webb f8c3e0e5aa Respect custom username/password properties 
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
 2021-06-08 14:58:39 -07:00
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