Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
9e203cbe6d Merge branch '2.5.x' 2021-10-19 18:43:11 +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
feed904814 Merge branch '2.4.x' into 2.5.x 2021-10-19 18:40:08 +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
6c43914652 Merge branch '2.5.x'
Closes gh-28383
2021-10-19 17:43:40 +01:00
Andy Wilkinson
76272ffb62 Merge branch '2.4.x' into 2.5.x
Closes gh-28382
2021-10-19 17:43:30 +01:00
Andy Wilkinson
6c45878541 Merge pull request #28376 from fml2
* gh-28376:
  Polish "Fix typos in EnvironmentPostProcessor javadoc"
  Fix typos in EnvironmentPostProcessor javadoc

Closes gh-28376
2021-10-19 17:43:24 +01:00
Andy Wilkinson
54ce51e43c Polish "Fix typos in EnvironmentPostProcessor javadoc"
See gh-28376
2021-10-19 17:43:16 +01:00
fml2
ded396b728 Fix typos in EnvironmentPostProcessor javadoc
See gh-28376
2021-10-19 17:41:46 +01:00
Andy Wilkinson
356554311f Merge branch '2.5.x'
Closes gh-28381
2021-10-19 17:17:29 +01:00
Andy Wilkinson
dfb349e9ca Merge pull request #28375 from artembilan
* gh-28375:
  Remove redundant info about DefaultMetricsFactory

Closes gh-28375
2021-10-19 17:17:19 +01:00
Artem Bilan
344d008848 Remove redundant info about DefaultMetricsFactory
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
2021-10-19 16:55:51 +01:00
Andy Wilkinson
4839f0eec0 Merge pull request #28361 from bartoszJaszczak
* gh-28361:
  Polish "Make UserDetailsService back off with AuthManagerResolver bean"
  Make UserDetailsService back off with AuthManagerResolver bean

Closes gh-28361
2021-10-19 16:48:05 +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
791f3f57c6 Upgrade to Spring Kafka 2.8.0-RC1
Closes gh-28257
2021-10-19 14:45:44 +01:00
Andy Wilkinson
f91147097a Merge branch '2.5.x' 2021-10-19 14:36:34 +01:00
Andy Wilkinson
ab3396de26 Upgrade to Spring Security 5.5.3
Closes gh-28247
2021-10-19 14:35:22 +01:00
Andy Wilkinson
d767e0e1f1 Upgrade to Spring Kafka 2.7.8
Closes gh-28246
2021-10-19 14:34:39 +01:00
Andy Wilkinson
b00a5cb91e Merge branch '2.4.x' into 2.5.x 2021-10-19 14:34:06 +01:00
Andy Wilkinson
ce8671ff37 Upgrade to Spring Security 5.4.9
Closes gh-28228
2021-10-19 14:32:57 +01:00
Andy Wilkinson
669caa92f8 Upgrade to Spring Kafka 2.6.11
Closes gh-28227
2021-10-19 14:32:33 +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
8ac2a59000 Upgrade to Spring Security 5.6.0-RC1
Closes gh-28258
2021-10-19 11:18:41 +01:00
Andy Wilkinson
2e6b0bbce1 Merge pull request #28355 from artembilan
* gh-28355:
  Polish "Add a config prop to enable/disable SI's default logging"
  Add a config prop to enable/disable SI's default logging

Closes gh-28355
2021-10-19 11:11:40 +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
14fb9c437d Merge branch '2.5.x'
See gh-28377
2021-10-19 11:03:51 +01:00
Andy Wilkinson
bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration
See gh-28345
2021-10-19 11:03:20 +01:00
Andy Wilkinson
89b40e1e00 Add support for Log4j2's composite configuration
Closes gh-27110
2021-10-19 10:01:30 +01:00
Stephane Nicoll
d6aab2fe84 Merge branch '2.5.x' 2021-10-19 10:51:36 +02:00
Stephane Nicoll
0f5bd90539 Add checkstyle ignore for unusual test structure 2021-10-19 10:50:21 +02:00
Phillip Webb
04123e0a0e Merge branch '2.5.x'
Closes gh-28377
2021-10-18 21:47:07 -07:00
Phillip Webb
b93a629dbe Shutdown in-memory R2DBC databases before devtools restart
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.

The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.

Fixes gh-28345
2021-10-18 21:46:12 -07:00
Phillip Webb
19d3007806 Polish 2021-10-18 21:44:56 -07:00
Andy Wilkinson
9ff17edb78 Upgrade to Spring Data 2021.1.0-RC1
Closes gh-28255
2021-10-18 19:17:20 +01:00
Andy Wilkinson
43a10eab59 Upgrade to Spring AMQP 2.4.0-RC1
Closes gh-28256
2021-10-18 19:15:37 +01:00
Andy Wilkinson
765a223235 Merge branch '2.5.x' 2021-10-18 19:14:56 +01:00
Andy Wilkinson
f87b2478d5 Upgrade to Spring AMQP 2.3.11
Closes gh-28245
2021-10-18 19:14:28 +01:00
Andy Wilkinson
f12716596b Merge branch '2.4.x' into 2.5.x 2021-10-18 19:13:29 +01:00
Andy Wilkinson
754b52c6bc Upgrade to Spring AMQP 2.3.11
Closes gh-28226
2021-10-18 19:12:19 +01:00
Andy Wilkinson
31d88c3d3c Improve failure analysis action when circular references are allowed
Closes gh-27735
2021-10-18 16:02:13 +01:00
Andy Wilkinson
42ef97b9ec Merge branch '2.5.x'
Closes gh-28372
2021-10-18 15:07:16 +01:00
Andy Wilkinson
5f4c001316 Merge branch '2.4.x' into 2.5.x
Closes gh-28371
2021-10-18 15:06:58 +01:00
Andy Wilkinson
a93cf64834 Make JMX endpoints available when lazy init is enabled
Closes gh-28335
2021-10-18 13:37:45 +01:00
Andy Wilkinson
416a3d6a31 Merge branch '2.5.x' 2021-10-18 13:32:44 +01:00
Andy Wilkinson
e865c3a7d7 Merge branch '2.4.x' into 2.5.x 2021-10-18 13:32:30 +01:00