Commit Graph

3039 Commits

Author SHA1 Message Date
Stephane Nicoll 9241f228d5 Add .gitattributes
Closes gh-28474
2021-10-28 15:31:40 +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