Commit Graph

33658 Commits

Author SHA1 Message Date
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 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
Brian Clozel a3182e453c Merge branch '2.4.x' into 2.5.x 2021-10-21 14:24:50 +02:00
Spring Builds 25c3229b8d Next development version (v2.5.7-SNAPSHOT) 2021-10-21 12:19:24 +00:00
Spring Builds d6a10012b3 Next development version (v2.4.13-SNAPSHOT) 2021-10-21 09:49:13 +00:00
Stephane Nicoll 6cdafc4b72 Upgrade to Spring Session 2021.0.3
Closes gh-28248
2021-10-21 09:13:41 +02:00
Stephane Nicoll 4a9931f5e8 Merge branch '2.4.x' into 2.5.x 2021-10-21 09:07:45 +02:00
Stephane Nicoll 7e3d663762 Upgrade Ubuntu version in CI images
Closes gh-28401
2021-10-21 09:07:22 +02:00
Stephane Nicoll 60c815ad42 Upgrade Ubuntu version in CI images
Closes gh-28402
2021-10-21 09:05:41 +02:00
Stephane Nicoll 3abda656f0 Upgrade to Spring Session 2020.0.7
Closes gh-28229
2021-10-21 09:00:26 +02:00
Stephane Nicoll d80d692029 Upgrade to Spring Framework 5.3.12
Closes gh-28241
2021-10-21 08:53:57 +02:00
Stephane Nicoll cc54be43ee Merge branch '2.4.x' into 2.5.x 2021-10-21 08:53:42 +02:00
Stephane Nicoll 91524ccc95 Upgrade to Spring Framework 5.3.12
Closes gh-28223
2021-10-21 08:53:23 +02:00
Stephane Nicoll 841f8b480a Merge branch '2.4.x' into 2.5.x 2021-10-20 09:57:11 +02:00
Stephane Nicoll 7328f609c2 Upgrade to XmlUnit2 2.8.3
Closes gh-28397
2021-10-20 09:26:11 +02:00
Stephane Nicoll 8d3e67e561 Upgrade to SendGrid 4.7.6
Closes gh-28396
2021-10-20 09:26:10 +02:00
Stephane Nicoll 80e3c9a9cc Upgrade to MySQL 8.0.27
Closes gh-28395
2021-10-20 09:26:09 +02:00
Stephane Nicoll cae0b50393 Upgrade to Ehcache3 3.9.7
Closes gh-28394
2021-10-20 09:26:07 +02:00
Stephane Nicoll 3d2091136a Upgrade to Nimbus JOSE JWT 8.23
Closes gh-28392
2021-10-20 08:47:14 +02:00
Stephane Nicoll 3e6da7ee2b Upgrade to MySQL 8.0.27
Closes gh-28391
2021-10-20 08:47:13 +02:00
Stephane Nicoll 5865246920 Upgrade to Ehcache3 3.9.7
Closes gh-28390
2021-10-20 08:47:12 +02:00
Stephane Nicoll 9b1660a111 Upgrade to Spring Integration 5.5.5
Closes gh-28249
2021-10-20 08:43:36 +02: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 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 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 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 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 bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration
See gh-28345
2021-10-19 11:03:20 +01:00
Stephane Nicoll 0f5bd90539 Add checkstyle ignore for unusual test structure 2021-10-19 10:50:21 +02: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 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 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 e865c3a7d7 Merge branch '2.4.x' into 2.5.x 2021-10-18 13:32:30 +01:00