Commit Graph

3188 Commits

Author SHA1 Message Date
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
Phillip Webb a48c98b469 Revert "Switch default MVC path matching strategy"
This reverts commit ab8e599cfe.

See gh-24805
2021-04-15 17:35:24 -07:00
Phillip Webb beaf03a008 Update copyright year of changed files 2021-04-15 12:22:48 -07:00
izeye e27c85698d Polish
See gh-26135
2021-04-15 16:31:10 +02:00
Stephane Nicoll 8c15e693d3 Merge branch '2.4.x'
Closes gh-26109
2021-04-14 15:07:23 +02:00
Stephane Nicoll 0d81b4d07e Merge branch '2.3.x' into 2.4.x
Closes gh-26108
2021-04-14 15:04:28 +02:00
Stephane Nicoll c04d640452 Scan for ElasticSearch's @Document type
Closes gh-26028
2021-04-14 14:42:32 +02:00
Stephane Nicoll 62a70475c2 Fix class condition on deprecated class
Closes gh-26107
2021-04-14 13:30:20 +02:00
Andy Wilkinson f45202e86f Ensure String to RSA key converters can be used
Add tests to ensure that RSA key converters can be used with an
auto-configured security setup.

See gh-26089
Closes gh-24891
2021-04-13 19:13:11 -07:00
dreis2211 4a1924ed73 Fix Spring Data Elasticsearch deprecations
See gh-26078
2021-04-13 20:05:48 +01:00
Andy Wilkinson 2e25a256d5 Allow the auto-configured RabbitMQ ConnectionFactory to be customized
Closes gh-6719
2021-04-13 18:14:38 +01:00
Andy Wilkinson 04e441f468 Add a config prop for the embedded database connection
Previously, the embedded database connection that would be used
could only be controlled via the classpath. If multiple embedded
database dependencies were present, it wasn't possible to control
the one that the auto-configured would use. It also wasn't possible
to disable auto-configuration of an embedded database.

This commit introduces a new configuration property,
spring.datasource.embedded-database-connection. It can be set to
one of the values of the EmbeddedDatabaseConnection enum to control
the auto-configuration of an embedded database. Setting it to none
will disable the auto-configuration and ensure that an external
database is used instead.

Closes gh-23412
2021-04-13 12:48:46 +01:00
Phillip Webb 89213c7d39 Switch default MVC path matching strategy
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
2021-04-12 18:43:08 -07:00
Scott Frederick b0ee15e7cc Merge branch '2.4.x'
Closes gh-26032
2021-04-12 16:05:08 -05:00
Scott Frederick 91ee590fd4 Remove @Persistent from MongoDB entity scanning
This commit removes `org.springframework.data.annotation.Persistent`
from the annotation types used for MongoDB entity scanning to align
with Spring Data MongoDB.

Fixes gh-25797
2021-04-12 16:04:38 -05:00
Stephane Nicoll 1f71c8241c Merge branch '2.4.x'
Closes gh-26030
2021-04-12 16:55:37 +02:00
Stephane Nicoll 305bcb10ae Merge branch '2.3.x' into 2.4.x
Closes gh-26029
2021-04-12 16:55:26 +02:00
Stephane Nicoll d96fcf320c Harmonize Elasticsearch converter auto-configuration
This commit harmonizes our auto-configuration so that default converters
are configured the same way ElasticsearchConfigurationSupport does.

Closes gh-25087
2021-04-12 16:51:57 +02:00
Andy Wilkinson ba2583900f Provide auto-configuration for using Apache HttpClient 5 with WebClient
Closes gh-26004
2021-04-12 08:44:27 +01:00
dreis2211 ea55ca9971 Remove unused method parameters
See gh-25986
2021-04-12 08:40:13 +02:00
izeye 4987880afa Polish
See gh-25980
2021-04-12 08:37:02 +02:00
Stephane Nicoll 03f2054984 Start building against Spring Kafka 2.7.0 snapshots
See gh-25930
2021-04-09 13:40:17 +02:00
Stephane Nicoll b52902e92a Merge branch '2.4.x'
Closes gh-25923
2021-04-08 10:14:03 +02:00
Stephane Nicoll c6205f10f1 Merge branch '2.3.x' into 2.4.x
Closes gh-25922
2021-04-08 10:13:45 +02:00
Stephane Nicoll 25b7495d8e Polish "Properly close input streams when loading key stores"
See gh-25884
2021-04-08 09:25:03 +02:00
Alex Belyaev 1e3f5c342b Properly close input streams when loading key stores
See gh-25884
2021-04-08 09:21:58 +02:00
Phillip Webb e766c8b3a7 Revert "Switch default MVC path matching strategy"
This reverts commit ab8e599cfe.

See gh-24805
2021-04-07 15:17:02 -07:00
Phillip Webb ab8e599cfe Switch default MVC path matching strategy
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
2021-04-07 11:02:45 -07:00
Phillip Webb 455864bfa0 Allow 'servet.path' with path pattern parser
Remove the restriction previously prevented `spring.mvc.servlet.path`
from being combined with a `spring.mvc.pathmatch.matching-strategy`
of `PATH_PATTERN_PARSER`. Spring Framework supports this combination
as of v5.3.4.

See gh-24805
2021-04-07 10:59:55 -07:00
Phillip Webb 72ccab0aad Fix WebSessionManager auto-configuration order
Auto-configure `SessionAutoConfiguration` before
`WebFluxAutoConfiguration` to ensure that the correct
`WebSessionManager` bean is created.

See gh-20970
2021-04-06 22:43:42 -07:00
Phillip Webb 807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00
Phillip Webb 4b05dbf4a2 Polish 2021-04-06 14:59:13 -07:00
Andy Wilkinson 1994219399 Polish "Add config props for keep-alive timeout and max keep-alive reqs"
See gh-25815
2021-04-06 20:32:18 +01:00
Parviz Rozikov 34b94d8898 Add config props for keep-alive timeout and max keep-alive reqs
See gh-25815
2021-04-06 20:32:18 +01:00
Brian Clozel dc6b5badb8 Add SameSite session cookie config property for WebFlux
This commit adds a new `spring.webflux.session.cookie.same-site`
confuguration property that sets the default value for the "SameSite"
attribute in the WebFlux session cookies.

Closes gh-20970
2021-04-06 21:29:47 +02:00
Stephane Nicoll dd916f908f Merge branch '2.4.x'
Closes gh-25880
2021-04-04 11:19:13 +02:00
Stephane Nicoll db3dfffdca Polish contribution
See gh-25875
2021-04-04 11:15:49 +02:00
izeye 852e5778a3 Polish
See gh-25875
2021-04-04 11:12:03 +02:00
Andy Wilkinson 66e9619d65 Merge branch '2.4.x'
Closes gh-25870
2021-04-01 19:21:31 +01:00
Andy Wilkinson 0005263f76 Merge branch '2.3.x' into 2.4.x
Closes gh-25869
2021-04-01 19:01:28 +01:00
Andy Wilkinson 1b91c1706e Ensure that Cassandra's DriverConfigLoader is only closed once
Fixes gh-25796
2021-04-01 18:57:35 +01:00
Andy Wilkinson cbfeb18e6a Merge branch '2.4.x'
Closes gh-25864
2021-04-01 15:36:01 +01:00
Andy Wilkinson d82889f42e Merge branch '2.3.x' into 2.4.x
Closes gh-25863
2021-04-01 15:00:51 +01:00
Andy Wilkinson cf0bd0f959 Polish "Fix no such bean definition with ancestor-defined Validator"
See gh-25800
2021-04-01 15:00:10 +01:00
MatejNedic 8958101510 Fix no such bean definition with ancestor-defined Validator
See gh-25800
2021-04-01 14:59:50 +01:00
Andy Wilkinson 6a7de18101 Merge branch '2.4.x'
Closes gh-25862
2021-04-01 10:25:29 +01:00
Andy Wilkinson d1359220ed Merge branch '2.3.x' into 2.4.x
Closes gh-25861
2021-04-01 10:07:59 +01:00
Andy Wilkinson 7d632ea397 Use ApplicationContextRunner in ValidationAutoConfigurationTests
Closes gh-25859
2021-04-01 10:01:37 +01:00
Andy Wilkinson 7aabd8bf2d Ensure that class proxying is forced before AutoProxyCreator is created
Previously, using @EnableGlobalMethodSecurity would cause the
AutoProxyCreator to be created before the AOP auto-configuration had
called AopUtils.forceAutoProxyCreatorToUseClassProxying. Forcing
auto proxy creation changes the AutoProxyCreator's bean definition
so it has no effect when attempted after the creator has been created.

This commit updates the AOP auto-configuration to use a
BeanFactoryPostProcessor to force the use of class proxying. This
ensures that the changes to the auto proxy creator's bean definition
are in place before any bean creation has been performed.

Fixes gh-25413
2021-03-31 20:29:28 +01:00
Phillip Webb 8c31d29acf Merge branch '2.4.x' 2021-03-30 09:29:59 -07:00
Phillip Webb a28a3ae090 Merge branch '2.3.x' into 2.4.x 2021-03-30 09:25:46 -07:00
Phillip Webb 9c8a97809d Consistent use of @deprecated since
Restore the patch version number for consistency with `@since`
tags.

See gh-25808
2021-03-30 09:20:30 -07:00
Brian Clozel fe1011c23d Add Netty memory leak detection config property
This commit adds a new `spring.netty.leak-detection` configuration
property that selects the level of memory leak detection for the Netty
engine.

This configuration is applied statically to Netty; this means all
(non-shaded) Netty usages as client or server will be impacted by this
change.

Developers might use this property during development or tests to find
causes of memory leaks when dealing with Netty buffers.

Closes gh-14338
2021-03-30 18:05:25 +02:00
Andy Wilkinson 66e857f2c5 Merge branch '2.4.x'
See gh-25826
2021-03-30 09:25:42 +01:00
Andy Wilkinson d9ce30b15c Merge branch '2.3.x' into 2.4.x
See gh-25825
2021-03-30 09:23:24 +01:00
Andy Wilkinson 8b6eef6f1d Consistent use of @deprecated since
See gh-25808
2021-03-30 09:22:45 +01:00
Phillip Webb 4ad87a861d Restore deprecated JobLauncherCommandLineRunner
Restore the deprecated `JobLauncherCommandLineRunner` class and extend
removal until 2.6. The class is still needed by spring-cloud-task.

Closes gh-25807
2021-03-29 15:56:38 -07:00
Phillip Webb 44b1751bb4 Merge branch '2.4.x'
Closes gh-25826
2021-03-29 15:48:20 -07:00
Phillip Webb 363f5829d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb 26dd1b9a26 Update deprecations with for removal targets
Update all deprecation tags to include a removal target.

Closes gh-25808
2021-03-29 15:44:58 -07:00
Andy Wilkinson 9b65409e23 Generalize database initialization detection and include R2DBC
Closes gh-25818
2021-03-29 20:07:54 +01:00
Stephane Nicoll 9087c24713 Merge branch '2.4.x'
See gh-25820
2021-03-29 14:38:57 +02:00
Stephane Nicoll 8bb4020bd4 Polish
See gh-25819
2021-03-29 14:36:26 +02:00
Andy Wilkinson 676713be3f Merge branch '2.4.x'
Closes gh-25820
2021-03-29 13:01:02 +01:00
Andy Wilkinson 403e747c46 Use constructor injection in SpringBootRepositoryRestConfigurer
Closes gh-25819
2021-03-29 13:00:02 +01:00
Andy Wilkinson e49a88cb9b Auto-configure script-based R2DBC database initialization
See gh-24741
2021-03-29 12:01:19 +01:00
Andy Wilkinson 9cc7f0b54d Generalize script-based DB initialization and add R2DBC initializer
See gh-24741
2021-03-29 11:51:02 +01:00
Andy Wilkinson eb1200415d Derive a ConnectionFactoryBuilder from an existing ConnectionFactory
Closes gh-25788
2021-03-29 09:17:05 +01:00
Stephane Nicoll 870d9b191a Merge branch '2.4.x'
Closes gh-25813
2021-03-27 08:06:21 +01:00
Stephane Nicoll d1aaee46bb Merge branch '2.3.x' into 2.4.x
Closes gh-25812
2021-03-27 08:06:02 +01:00
dreis2211 be4491959b Fix flaky QuartzAutoConfigurationTests
See gh-25810
2021-03-27 08:00:52 +01:00
Phillip Webb 02a6de4498 Merge branch '2.4.x'
Closes gh-25787
2021-03-24 12:53:06 -07:00
Phillip Webb ddf5c9f5d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25786
2021-03-24 12:52:51 -07:00
Phillip Webb 88b74097ba Polish 'Ignore quality value when removing MediaType.ALL'
See gh-25778
2021-03-24 12:35:56 -07:00
Fábio Ramon 3090a3a71f Ignore quality value when removing MediaType.ALL
Update the default reactive exception handler so that `MediaType.ALL`
is removed regardless of any quality setting. Prior to this commit,
the "match-all" media type was not properly ignored if it has a quality
value and would show HTML content if the accept header was
`application/json, */*;q=0.9`.

See gh-25778
2021-03-24 12:35:32 -07:00
Andy Wilkinson 90b4ced7a6 Move DataSource init auto-config out of DataSourceAutoConfiguration
Previously, the auto-configuration for DataSource initialization and
the properties used to configure it were part of the general
DataSource auto-configuration and properties.

This commit moves the auto-configuration of DataSource initialization
out into a separate top-level auto-configuration class. Similarly,
the properties for configuring DataSource initialization have been
moved from `spring.datasource.*` into `spring.sql.init.*`.

The old initialization-related `spring.datasource.*` properties have
been deprecated but can still be used. When they are used, they new,
separate initialization auto-configuration will back off. In other
words, the initialization related `spring.datasource.*` properties
and the `spring.sql.init.*` properties cannot be used in combination.

Closes gh-25323
2021-03-24 14:57:29 +00:00
Andy Wilkinson 5758a5aa39 Rename DDL/DML script location properties
See gh-25756
2021-03-24 12:20:36 +00:00
Stephane Nicoll 36b63eec4b Polish "Expose Spring Integration global properties"
See gh-25377
2021-03-24 11:03:26 +01:00
Artem Bilan e2df9bce84 Expose Spring Integration global properties
Spring Integration comes with some global properties which can be
configured via `META-INF/spring.integration.properties`. The framework
then provides an `integrationGlobalProperties` bean as an
`org.springframework.integration.context.IntegrationProperties`
instance.

This commit allows users to configure these using regular
`application.properties`. If a `META-INF/spring.integration.properties`
file exists, the values are used as fallback.

See gh-25377
2021-03-24 11:03:26 +01:00
Phillip Webb 77ddb45704 Merge branch '2.4.x' 2021-03-23 12:53:59 -07:00
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb 82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Andy Wilkinson 5dee68c925 Move script-based DataSource initializer into spring-boot
Closes gh-25487
Closes gh-25756
2021-03-22 20:14:30 +00:00
Andy Wilkinson fa336bb565 Move DataSource dependency detection into dedicated package
Closes gh-25757
2021-03-22 14:23:14 +00:00
Stephane Nicoll a900306b17 Merge branch '2.4.x'
Closes gh-25755
2021-03-22 14:46:37 +01:00
Stephane Nicoll 2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
2021-03-22 14:44:48 +01:00
Stephane Nicoll c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
2021-03-22 14:41:25 +01:00
bono007 674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
2021-03-22 13:53:28 +01:00
Andy Wilkinson 64f9d8d4fe Deprecate support for Mustache's Environment fallback
Closes gh-21045
2021-03-22 11:45:01 +00:00
Phillip Webb 663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Stephane Nicoll eff3a4f1a6 Upgrade to Spring Kafka 2.7.0-RC1
Closes gh-25582
2021-03-18 08:14:09 +01:00
Phillip Webb 8ba45cc6b5 Allow DB migrations without DataSourceProperties
Update `FlywayAutoConfiguration`, `LiquibaseAutoConfiguration` and
`DataSourceInitializer` classes so that they no longer depend on
`DataSourceProperties`. DB migrations can now be performed against
a `@Bean` defined primary `DataSource` with an alternative
username/password.

This update also removed using fallback properties when a custom
connection `url` is defined with Flyway or Liquibase. We now assume
that `username`, `password` and `driver-class-name` will be provided
if the default values are unacceptable. Our previous logic was
particularly flawed if a custom URL caused a change of driver type.

Closes gh-25643
2021-03-17 17:05:04 -07:00
Phillip Webb 6e92daa0a0 Change Kafka cleanup.on-shutdown default to false
Align our property with the recently changed spring-kafka default.

Closes gh-25730
2021-03-17 16:38:46 -07:00
Stephane Nicoll 54e7d7f060 Promote ConnectionFactoryBuilder to the "spring-boot" module
Closes gh-25492
2021-03-17 16:26:54 +00:00
Andy Wilkinson 7ef9ca02c1 Merge branch '2.4.x'
Closes gh-25718
2021-03-17 12:26:58 +00:00
Andy Wilkinson 758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson b1f5f34617 Merge branch '2.4.x'
Closes gh-25693
2021-03-16 16:35:47 +00:00
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