3010 Commits

Author SHA1 Message Date
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
Scott Frederick
3d21ac7a20 Add required id field to Spring Data Neo4j test class
Fixes gh-28303
2021-10-12 17:59:19 -05:00
Scott Frederick
a74b911870 Merge branch '2.5.x' 2021-10-12 16:46:19 -05:00
Scott Frederick
3755c563df Merge branch '2.4.x' into 2.5.x 2021-10-12 16:45:51 -05:00
Scott Frederick
3c6e061917 Remove unused import
See gh-28223
2021-10-12 16:45:43 -05:00
Scott Frederick
604b4a004d Merge branch '2.5.x' 2021-10-12 16:18:21 -05:00
Scott Frederick
ec6bfa8062 Merge branch '2.4.x' into 2.5.x 2021-10-12 16:17:48 -05:00
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
2021-10-12 16:17:16 -05:00
Madhura Bhave
e571894903 Merge pull request #28169 from Pooja199
* pr/28169:
  Auto-configure JwtSupplierDecoder to defer OIDC lookup

Closes gh-28169
2021-10-06 16:40:05 -07:00
Anjee
4e9f536a8e Auto-configure JwtSupplierDecoder to defer OIDC lookup
See gh-28169
2021-10-06 16:39:26 -07:00
Andy Wilkinson
1a505964ee Merge branch '2.5.x'
Closes gh-28207
2021-10-06 10:03:24 +01:00
Andy Wilkinson
1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson
bddfe9ef6e Merge branch '2.5.x'
See gh-28135
2021-10-01 11:32:59 +01:00
Andy Wilkinson
d238566920 Merge branch '2.4.x' into 2.5.x
See gh-28134
2021-10-01 11:32:22 +01:00
Andy Wilkinson
a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses
Closes gh-28133
2021-10-01 11:30:11 +01:00
Stephane Nicoll
14fc0f78b2 Polish "Stop considering persistent when scanning for Couchbase entities"
See gh-28124
2021-10-01 08:31:14 +02:00
Dąbrowski
067b349fb1 Stop considering persistent when scanning for Couchbase entities
See gh-28124
2021-10-01 08:28:36 +02:00
Phillip Webb
ca69c8b98c Merge branch '2.5.x'
Closes gh-28135
2021-09-26 13:06:35 -07:00
Phillip Webb
fcb6f557f7 Merge branch '2.4.x' into 2.5.x
Closes gh-28134
2021-09-26 13:06:14 -07:00
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
2021-09-26 13:05:17 -07:00
Andy Wilkinson
ab95c2fa3b Polish descriptions of spring.integration.poller properties
Closes gh-28126
2021-09-24 10:09:18 +01:00
Andy Wilkinson
3274e24d55 Polish "Add Spring Integration default poller auto-config"
See gh-27992

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-09-23 16:20:13 -07:00
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
2021-09-23 16:20:13 -07:00
Andy Wilkinson
342c749784 Polish 2021-09-22 20:28:31 +01:00
Andy Wilkinson
4fa61cbc60 Merge branch '2.5.x' 2021-09-22 18:37:11 +01:00
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
2021-09-22 18:30:44 +01:00
Stephane Nicoll
233b63199c Polish "Clarify pooling is implicitly enabled in Sentinel mode"
See gh-27891
2021-09-22 11:52:46 +02:00
weixsun
d39b7cc46d Clarify pooling is implicitly enabled in Sentinel mode
See gh-27891
2021-09-22 11:48:36 +02:00
Phillip Webb
667e5ca30c Polish 2021-09-21 14:45:01 -07:00