Commit Graph

3182 Commits (bfc9094562a5d21890ebb575f3f72b277924d1c2)

Author SHA1 Message Date
Stephane Nicoll a2eeb77e21 Merge branch '2.6.x' into 2.7.x
Closes gh-28951
3 years ago
Vedran Pavic 0af4431db8 Apply SameSite session cookie property to Spring Session
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.

See gh-28784
3 years ago
Stephane Nicoll 89635eafa3 Update copyright year of changed files
See gh-28862
3 years ago
Stefano Cordio a5c56043b9 Simplify AssertJ usage
See gh-28862
3 years ago
Stephane Nicoll 25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property
Closes gh-28936
3 years ago
Željko Tomić 1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization
See gh-28779
3 years ago
Phillip Webb beb68671bb Update copyright year of changed files 3 years ago
Madhura Bhave e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
3 years ago
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties
Closes gh-28762
3 years ago
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
3 years ago
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
3 years ago
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor
Closes gh-28705
3 years ago
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4
Closes gh-28697
3 years ago
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
3 years ago
Stephane Nicoll 6e06e69bba Merge branch '2.5.x'
Closes gh-28673
3 years ago
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x
Closes gh-28672
3 years ago
Stephane Nicoll d21c48e474 Update copyright year of changed file
See gh-28532
3 years ago
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition
See gh-28532
3 years ago
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
3 years ago
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
3 years ago
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
3 years ago
Andy Wilkinson 925ddd6b09 Merge branch '2.5.x' 3 years ago
Andy Wilkinson 3b180f42b7 Polish 3 years ago
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x'
Closes gh-28607
3 years ago
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28606
3 years ago
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI
Closes gh-28594
3 years ago
Andy Wilkinson ceacb1533a Merge branch '2.5.x' 3 years ago
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 3 years ago
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering
See gh-28506
3 years ago
Stephane Nicoll 629e1d3ac5 Upgrade to Flyway 8.0.3
Closes gh-28572
3 years ago
Stephane Nicoll bf88405121 Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure
Closes gh-28540
3 years ago
Stephane Nicoll 11a5055b8f Merge branch '2.5.x' 3 years ago
Stephane Nicoll cd5508a679 Polish 3 years ago
Stephane Nicoll 98b9e1ab21 Start building against Spring Framework 5.3.13 snapshots
See gh-28515
3 years ago
izeye 5d8dce70dc Polish
See gh-28494
3 years ago
Andy Wilkinson ef2bcdd3ed Merge branch '2.5.x'
Closes gh-28483
3 years ago
Andy Wilkinson 07ed7ab944 Merge branch '2.4.x' into 2.5.x
Closes gh-28482
3 years ago
Andy Wilkinson 2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default
Closes gh-28481
3 years ago
Andy Wilkinson c9dd6b7e86 Merge branch '2.5.x'
Closes gh-28480
3 years ago
Andy Wilkinson ae93bb3a11 Merge branch '2.4.x' into 2.5.x
Closes gh-28479
3 years ago
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
3 years ago
Stephane Nicoll 9241f228d5 Add .gitattributes
Closes gh-28474
3 years ago
Stephane Nicoll 66553ac8c7 Add .gitattributes
Closes gh-28473
3 years ago
Stephane Nicoll 1b3f52d609 Harmonize line endings
See gh-27615
3 years ago
Stephane Nicoll 837e2ac277 Fix bean type visibility
Closes gh-28437
3 years ago
Andy Wilkinson 3605388787 Merge branch '2.5.x'
Closes gh-28440
3 years ago
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x
Closes gh-28439
3 years ago
Andy Wilkinson a545b6e0b4 Polish "Polish"
See gh-28367
3 years ago
Leo Li 1586232761 Polish
See gh-28367
3 years ago
Andy Wilkinson 47da70632f Merge branch '2.5.x'
Closes gh-28430
Closes gh-28431
3 years ago
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages"
See 2f6651c3cb.

Closes gh-28408
3 years ago
Phillip Webb e25f216eab Merge branch '2.5.x'
Closes gh-28425
3 years ago
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages
Closes gh-28408
3 years ago
Andy Wilkinson 2541c0cbdc Disable on Windows tests that use embedded Kafka
Closes gh-28406
3 years ago
Phillip Webb 1ad39b5fce Fix ReactiveSessionAutoConfigurationRedisTests
See gh-26714
3 years ago
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>
3 years ago
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
3 years ago
Phillip Webb 3c71637fa2 Polish 'Add more session properties for reactive web servers'
See gh-26714
3 years ago
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
3 years ago
Madhura Bhave ea65c28bfa Polish 3 years ago
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
3 years ago
Madhura Bhave 0d06a2854d Polish "Support PEM format for Kafka SSL certs and private key"
See gh-28123
3 years ago
Tim te Beek 7a98364a23 Support PEM format for Kafka SSL certs and private key
See gh-28123
3 years ago
Andy Wilkinson f2b3f1f41f Make URL- and property-based pooling config mutually exclusive
Closes gh-28144
3 years ago
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
3 years ago
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
3 years ago
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
3 years ago
Andy Wilkinson 9b77151caa Polish "Make UserDetailsService back off with AuthManagerResolver bean"
See gh-28361
3 years ago
Bartosz Jaszczak 31cdfd524e Make UserDetailsService back off with AuthManagerResolver bean
See gh-28361
3 years ago
Andy Wilkinson a27dfcb9b0 Make R2DBC auto-config back off without a connection provider
Closes gh-26439
3 years ago
Andy Wilkinson 2af2a02fbb Merge branch '2.5.x'
Closes gh-28380
3 years ago
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x
Closes gh-28379
3 years ago
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC
Fixes gh-28378
3 years ago
Andy Wilkinson 657eb86dad Polish "Add a config prop to enable/disable SI's default logging"
See gh-28355
3 years ago
Artem Bilan c6891c5184 Add a config prop to enable/disable SI's default logging
See gh-28355
3 years ago
Andy Wilkinson 3969e63ced Merge branch '2.5.x'
See gh-28252
3 years ago
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x
See gh-28241
3 years ago
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC
See gh-28223
3 years ago
Stephane Nicoll 0b32215c13 Polish "Log URLs for all DataSources"
See gh-28204
3 years ago
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
3 years ago
Phillip Webb 2034ad4827 Merge branch '2.5.x' 3 years ago
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb 0561992c2a Update copyright year of changed files 3 years ago
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
3 years ago
Andy Wilkinson b0dfca7d92 Configure Flyway with spring.flyway.script-placeholder-suffix
Fixes gh-28307
3 years ago
Andy Wilkinson 84b553a8ca Upgrade to Jackson Bom 2.13.0
Closes gh-28298
3 years ago
Andy Wilkinson 509427b671 Upgrade to Flyway 8.0.0
Closes gh-28296
3 years ago
Stephane Nicoll e978654c88 Polish "Fix Integration `fixedRate` property setting"
See gh-28237
3 years ago
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
3 years ago
Scott Frederick 3c9354305a Merge branch '2.5.x'
Closes gh-28305
3 years ago
Scott Frederick f427ea5802 Merge branch '2.4.x' into 2.5.x
Closes gh-28304
3 years ago
Scott Frederick 3d21ac7a20 Add required id field to Spring Data Neo4j test class
Fixes gh-28303
3 years ago
Scott Frederick a74b911870 Merge branch '2.5.x' 3 years ago
Scott Frederick 3755c563df Merge branch '2.4.x' into 2.5.x 3 years ago
Scott Frederick 3c6e061917 Remove unused import
See gh-28223
3 years ago
Scott Frederick 604b4a004d Merge branch '2.5.x' 3 years ago
Scott Frederick ec6bfa8062 Merge branch '2.4.x' into 2.5.x 3 years ago
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
3 years ago
Madhura Bhave e571894903 Merge pull request #28169 from Pooja199
* pr/28169:
  Auto-configure JwtSupplierDecoder to defer OIDC lookup

Closes gh-28169
3 years ago
Anjee 4e9f536a8e Auto-configure JwtSupplierDecoder to defer OIDC lookup
See gh-28169
3 years ago
Andy Wilkinson 1a505964ee Merge branch '2.5.x'
Closes gh-28207
3 years ago
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
3 years ago
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
3 years ago
Andy Wilkinson bddfe9ef6e Merge branch '2.5.x'
See gh-28135
3 years ago
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x
See gh-28134
3 years ago
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses
Closes gh-28133
3 years ago
Stephane Nicoll 14fc0f78b2 Polish "Stop considering persistent when scanning for Couchbase entities"
See gh-28124
3 years ago
Dąbrowski 067b349fb1 Stop considering persistent when scanning for Couchbase entities
See gh-28124
3 years ago
Phillip Webb ca69c8b98c Merge branch '2.5.x'
Closes gh-28135
3 years ago
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x
Closes gh-28134
3 years ago
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
3 years ago
Andy Wilkinson ab95c2fa3b Polish descriptions of spring.integration.poller properties
Closes gh-28126
3 years ago
Andy Wilkinson 3274e24d55 Polish "Add Spring Integration default poller auto-config"
See gh-27992

Co-authored-by: Phillip Webb <pwebb@vmware.com>
3 years ago
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
3 years ago
Andy Wilkinson 342c749784 Polish 3 years ago
Andy Wilkinson 4fa61cbc60 Merge branch '2.5.x' 3 years ago
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
3 years ago
Stephane Nicoll 233b63199c Polish "Clarify pooling is implicitly enabled in Sentinel mode"
See gh-27891
3 years ago
weixsun d39b7cc46d Clarify pooling is implicitly enabled in Sentinel mode
See gh-27891
3 years ago
Phillip Webb 667e5ca30c Polish 3 years ago
Phillip Webb 55a1ec72cc Update copyright year of changed files 3 years ago
Stephane Nicoll e0465f7357 Use RootBeanDefinition consistently
Closes gh-28077
3 years ago
Stephane Nicoll 124c3ac07c Polish "Add support for used-defined RedisStandaloneConfiguration"
See gh-28028
3 years ago
Eddú Meléndez 236c2dd0da Add support for used-defined RedisStandaloneConfiguration
See gh-28028
3 years ago
Stephane Nicoll 3e5038cddd Merge branch '2.5.x'
Closes gh-28073
3 years ago
Stephane Nicoll 4ee249c700 Merge branch '2.4.x' into 2.5.x
Closes gh-28072
3 years ago
Stephane Nicoll 15de85d89a Polish contribution
See gh-28061
3 years ago
Leo Li 0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints"
See gh-28061
3 years ago
dreis2211 cf0fcafd13 Polish
See gh-27940
3 years ago
Andy Wilkinson 808aa77747 Provide a config prop for Elasticsearch client's path prefix
Closes gh-25010
3 years ago
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
3 years ago
Andy Wilkinson 30815cc0e0 Upgrade to Spring Data 2021.1.0-M3
Closes gh-27932
3 years ago
Andy Wilkinson 74eed94a14 Upgrade to Thymeleaf Layout Dialect 3.0.0
Closes gh-28057
3 years ago
Andy Wilkinson 7924d1fc18 Upgrade to Flyway 7.15.0
Closes gh-28049
3 years ago
Andy Wilkinson 5857bcccc6 Merge branch '2.5.x'
Closes gh-28048
3 years ago
Andy Wilkinson 8364840cd5 Merge branch '2.4.x' into 2.5.x
Closes gh-28047
3 years ago
Andy Wilkinson eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config
Closes gh-28038
3 years ago
Stephane Nicoll 599cc1f696 Start building against Spring Data 2021.1.0-M3 snapshots
See gh-27932
3 years ago
Stephane Nicoll 78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler"
See gh-27927
3 years ago
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
3 years ago
dreis2211 e1afc91ae2 Polish javadoc comments
See gh-27925
3 years ago
Andy Wilkinson bb11abef2c Merge branch '2.5.x'
Closes gh-27923
3 years ago
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x
Closes gh-27922
3 years ago
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration
Closes gh-27919
3 years ago
Andy Wilkinson 8ab9dbad7a Merge branch '2.5.x'
Closes gh-27913
3 years ago
Andy Wilkinson 128f54fbd0 Merge branch '2.4.x' into 2.5.x
Closes gh-27911
3 years ago
Andy Wilkinson 11c79ac650 Move Docker-based reactive Elasticsearch test into separate class
Closes gh-27907
3 years ago
Andy Wilkinson 010d201002 Merge branch '2.5.x'
Closes gh-27906
3 years ago