3229 Commits

Author SHA1 Message Date
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 ab8e599cfedd6d626daaee65fc86d8c0ae470d16.

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 ab8e599cfedd6d626daaee65fc86d8c0ae470d16.

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