Commit Graph

2360 Commits

Author SHA1 Message Date
Andy Wilkinson 55f939e93b Merge branch '2.3.x'
Closes gh-23321
2020-09-15 16:35:00 +01:00
Andy Wilkinson 409743eddb Merge branch '2.2.x' into 2.3.x
Closes gh-23320
2020-09-15 16:32:43 +01:00
Andy Wilkinson 5a266155b0 Disable proxyBeanMethods on Spring Session config sub-classes
Closes gh-23280
2020-09-15 16:32:15 +01:00
Andy Wilkinson 7562c4eb6f Adapt to WebClient's new exception wrapping
See spring-projects/spring-framework#23842
See gh-23170
2020-09-14 15:08:56 +01:00
Phillip Webb 922b4c04bf Merge branch '2.3.x' 2020-09-11 19:01:44 -07:00
Phillip Webb f5ae58e8e5 Fix deprecation warning
See gh-23256
2020-09-11 19:01:22 -07:00
Phillip Webb f1d9832282 Merge branch '2.3.x'
Closes gh-23259
2020-09-11 18:45:39 -07:00
Phillip Webb 507fae5141 Merge branch '2.2.x' into 2.3.x
Closes gh-23258
2020-09-11 18:45:05 -07:00
Phillip Webb d8232b3c21 Polish 'Allow other "timestamp" types in MVC error model'
See gh-23256
2020-09-11 18:44:04 -07:00
lock14 d1d953819a Allow other "timestamp" types in MVC error model
Remove casting "timestamp" to `java.util.Date` in
`ErrorMvcAutoConfiguration` as the cast is not necessary and it
prevents other types (e.g. `java.time`) from being used.

See gh-23256
2020-09-11 18:11:47 -07:00
Stephane Nicoll 7a8b7b9fa7 Polish "Add separate property for Redis read and connection timeout"
See gh-23137
2020-09-11 11:46:27 +02:00
anshlykov 2527fcac9c Add separate property for Redis read and connection timeout
See gh-23137
2020-09-11 11:46:27 +02:00
Stephane Nicoll 36d4e95254 Merge branch '2.3.x'
Closes gh-23251
2020-09-11 10:03:42 +02:00
Stephane Nicoll 7c13c01cb6 Fix mapping of Cassandra's idle-timeout and heartbeat-interval
Previous to this commit the connection idle timeout and heartbeat
interval were mapped to seconds whereas Cassandra expects ms for all
duration types.

This commit fixes the mapping and removes the default duration unit
since it should be considered ms like every other duration properties.

Closes gh-23249
2020-09-11 08:59:34 +02:00
Brian Clozel 0715750eb3 Polish "Add SSL support to RSocketServer"
See gh-19399
2020-09-10 15:14:55 +02:00
cbono b4810b8b91 Add SSL support to RSocketServer
See gh-19399
2020-09-10 15:14:55 +02:00
Andy Wilkinson 8daf57fdeb Upgrade to Spring Security 5.4.0
The commit also includes an upgrade to Nimbus JOSE JWT 9.0. Spring
Security requires 9.0 and it is not backwards compatible with 8.19.

Closes gh-23225
Closes gh-23242
2020-09-10 11:00:54 +01:00
dreis2211 79ec1401a5 Enable Spring Integration RSocket test again
See gh-23229
2020-09-08 16:25:23 +01:00
Brian Clozel 9e0fd01aae Deprecate resource "app-cache" configuration support
This commit deprecates the
`"spring.resources.chain.html-application-cache"` configuration property
and its support, since the feature has been deprecated in Spring
Framework.

The app-cache manifest feature is being removed from browsers in favor
of web workers.

Closes gh-23228
2020-09-08 16:34:25 +02:00
Stephane Nicoll a73b7bb7dd Polish
This commit makes sure that no high-level client is auto-configured if
a low-level client is registered as a bean.

See gh-22358
2020-09-08 12:17:58 +02:00
Andy Wilkinson aa3c93078e Adapt to deprecation of ReactiveDataAccessStrategy
ReactiveDataAccessStrategy has been deprecated in Spring Data R2BC in
favor of R2dbcConverter (and StatementMapper and UpdateMapper). When
not using Boot, an R2dbcConverter bean is now defined by
AbstractR2dbcConfiguration. This commit updates
R2dbcDataAutoConfiguration to replace the definition of a
ReactiveDataAccessStrategy bean with the definition of an
R2dbcConverter bean.

See gh-23197
2020-09-08 10:36:00 +01:00
Brian Clozel 1d73d4eda7 Remove Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would auto-configure both
Elasticsearch variants: `RestClient` ("Low Level" client) and
`RestHighLevelClient` ("High Level" client).
Since one can be derived from the other, this would create complex and
unclear situations depending on what developers provided with their
configuration.

`RestHighLevelClient` is mostly for actual use of the Elasticsearch API,
with support for specific methods and (de)serialization. On the other
hand, `RestClient` is merely wrapping the Apache HTTP client for
load-balancing support and low level HTTP features.

This commit completely removes the support for `RestClient` in Spring
Boot and now requires the presence of the
`org.elasticsearch.client:elasticsearch-rest-high-level-client`
dependency for REST client support with Elasticsearch.

Closes gh-22358
2020-09-08 10:17:27 +02:00
Andy Wilkinson 016c46c6b3 Temporarily disable Spring Integration RSocket test
See gh-23214
See gh-23010
2020-09-08 09:00:19 +01:00
Stephane Nicoll 73c039e4b8 Fix use of deprecated methods 2020-09-07 09:42:19 +02:00
Stephane Nicoll d2eeb9524f Merge branch '2.2.x' into 2.3.x
See gh-23183
2020-09-07 09:17:51 +02:00
Stephane Nicoll 4b5a3f4ff9 Start building against Spring Framework 5.2.9 snapshots
See gh-23182
2020-09-07 08:47:57 +02:00
Stephane Nicoll 681abcc185 Polish "Configure SAML 2.0 Service Provider via Metadata"
See gh-23045
2020-09-02 10:31:50 +02:00
Josh Cummings 5187c01e39 Configure SAML 2.0 Service Provider via Metadata
See gh-23045
2020-09-02 10:03:41 +02:00
Stephane Nicoll ce169c4d51 Allow to customize how EntityScanner scans entities
This commit adds a protected method that lets an override customize the
configuration of the ClassPathScanningCandidateComponentProvider used
to scan entities.

Closes gh-23154
2020-09-01 10:00:41 +02:00
Andy Wilkinson 84a12c8436 Upgrade to Testcontainers 1.14.3
Closes gh-23122
2020-08-28 11:57:32 +01:00
Stephane Nicoll 674ad85cdb Polish "Add support for RabbitMQ's addressShuffleMode property"
See gh-23091
2020-08-27 14:37:11 +02:00
Jonghan Kim 4b77e2e205 Add support for RabbitMQ's addressShuffleMode property
See gh-23091
2020-08-27 14:26:46 +02:00
Johnny Lim e48af31ced Polish
See gh-23081
2020-08-26 10:47:45 +02:00
Stephane Nicoll 28b938a229 Merge branch '2.3.x'
Closes gh-23088
2020-08-26 10:00:24 +02:00
dreis2211 d8ba7dd4d0 Remove unused methods
See gh-23086
2020-08-26 09:57:49 +02:00
Andy Wilkinson e9ab269b3b Polish "Add a configuration property for KLC's idleBetweenPolls"
See gh-23048
2020-08-25 16:02:29 +01:00
hoaphan 03a8937d5c Add a configuration property for KLC's idleBetweenPolls
See gh-23048
2020-08-25 15:54:59 +01:00
Stephane Nicoll 085091dbe3 Adapt auto-configurations to back-off in presence of TransactionManager
Previous to this commit, an auto-configuration would create a
PlatformTransactionManager if none is present and others conditions are
met. Spring Framework now has the notion of TransactionManager, a parent
interface that gathers both PlatformTransactionManager and
ReactiveTransactionManager.

Spring Boot should not be in a situation where both managers are defined
out-of-the-box. This commit makes sure to back-off if any
TransactionManager is available.

Closes gh-22851
2020-08-25 15:32:38 +02:00
Stephane Nicoll f191b7513d Polish 2020-08-25 15:13:56 +02:00
Andy Wilkinson 7a5392d6bd Polish 2020-08-25 09:45:40 +01:00
Stephane Nicoll 640000c0bb Disable file system preference for Freemarker templates
Previously to this commit, a project that has several classpath
locations matching the template path may lead to some of those
locations to be ignored if one of them is a directory. This can easily
happen if you run your tests in your IDE.

This commit changes the default of "preferFileSystemAccess" to
false so that the complete classpath is always considered.

Closes gh-23051
2020-08-24 18:22:50 +02:00
Stephane Nicoll deee3606c3 Merge branch '2.3.x'
Closes gh-23064
2020-08-24 12:21:12 +02:00
Stephane Nicoll 0374ed2a0c Merge branch '2.2.x' into 2.3.x
Closes gh-23063
2020-08-24 12:20:30 +02:00
Stephane Nicoll 5b0f22e8fe Fix unintended import on commons lang
Closes gh-23059
2020-08-24 12:12:33 +02:00
Stephane Nicoll aed49c0631 Add configuration option for GridFsTemplate's bucket
Closes gh-22854
2020-08-20 10:45:51 +02:00
Phillip Webb ea8762c484 Update copyright year of changed files 2020-08-18 15:40:05 -07:00
Phillip Webb 2fb08ca48f Merge branch '2.3.x' 2020-08-18 15:39:29 -07:00
Phillip Webb 15a0cbc96b Update copyright year of changed files 2020-08-18 15:39:23 -07:00
Scott Frederick b7fdf8fe87 Preserve user-provided values in MongoClientSettings
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.

Fixes gh-22321
2020-08-17 16:07:40 -05:00
Stephane Nicoll 8c0318edc7 Polish "Consider RecordFilterStrategy in Kafka auto-configuration"
See gh-22973
2020-08-17 13:54:20 +02:00