Commit Graph

34440 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 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
Andy Wilkinson a722fe46fb Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 13:32:15 +01:00
Andy Wilkinson 21e290f81c Merge branch '2.5.x' 2021-10-18 13:00:01 +01:00
Andy Wilkinson 390fcd6b06 Merge branch '2.4.x' into 2.5.x 2021-10-18 12:59:47 +01:00
Andy Wilkinson 779439311d Revert "Upgrade to Spring Data 2020.0.14"
This reverts commit 752789d3ee.

See gh-28225
2021-10-18 12:59:20 +01:00
Andy Wilkinson c39e9fa918 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit fda26703b2.

See gh-28261
2021-10-18 12:32:37 +01:00
Andy Wilkinson 7ba65a7821 Merge branch '2.5.x' 2021-10-18 12:32:28 +01:00
Andy Wilkinson c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit c0605ffc71.

See gh-28250
2021-10-18 12:31:23 +01:00
Andy Wilkinson 394fe5d7b8 Merge branch '2.4.x' into 2.5.x 2021-10-18 12:30:49 +01:00
Andy Wilkinson 22e7ba6f64 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit 33ffae8e74.

See gh-28230
2021-10-18 12:30:20 +01:00
Andy Wilkinson b9c8de3733 Merge branch '2.5.x' 2021-10-18 12:28:49 +01:00
Andy Wilkinson 16dbdc5d88 Upgrade to Spring Data 2021.0.6
Closes gh-28244
2021-10-18 12:28:20 +01:00
Andy Wilkinson 04abaa2dd1 Merge branch '2.4.x' into 2.5.x 2021-10-18 12:27:34 +01:00
Andy Wilkinson 752789d3ee Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 12:26:24 +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 f01d086a8d Upgrade to MongoDB 4.4.0-beta1
Closes gh-28364
2021-10-15 18:03:51 +02:00
Stephane Nicoll 302d616b8c Upgrade to Ehcache3 3.9.7
Closes gh-28363
2021-10-15 18:03:49 +02:00
Stephane Nicoll f034c06aa2 Merge branch '2.5.x' 2021-10-15 11:37:44 +02:00
Stephane Nicoll 8b0c563832 Merge branch '2.4.x' into 2.5.x 2021-10-15 11:37:31 +02:00
Stephane Nicoll a445304584 Upgrade to Netty 4.1.69.Final
Closes gh-28360
2021-10-15 11:36:47 +02:00
Stephane Nicoll bad37f9e37 Upgrade to Netty 4.1.69.Final
Closes gh-28359
2021-10-15 11:30:53 +02:00
Stephane Nicoll 50fa0818a2 Merge branch '2.5.x' 2021-10-15 10:08:46 +02:00