16408 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
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
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
f87b2478d5 Upgrade to Spring AMQP 2.3.11
Closes gh-28245
2021-10-18 19:14:28 +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
a722fe46fb Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 13:32:15 +01:00
Andy Wilkinson
779439311d Revert "Upgrade to Spring Data 2020.0.14"
This reverts commit 752789d3ee72490b611830d6f68c06dc31d93a93.

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 fda26703b2e1df6dcaf319a47704a98cf8461880.

See gh-28261
2021-10-18 12:32:37 +01:00
Andy Wilkinson
c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit c0605ffc71f0086a7529eb117cdd587f9136e401.

See gh-28250
2021-10-18 12:31:23 +01:00
Andy Wilkinson
22e7ba6f64 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit 33ffae8e74adf1bee0fe98b7333dc6d0ff030564.

See gh-28230
2021-10-18 12:30:20 +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
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
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
a312dd5905 Upgrade to Spring HATEOAS 1.4.0-RC1
Closes gh-28254
2021-10-15 10:08:27 +02:00
Stephane Nicoll
ad819f6085 Upgrade to Micrometer 1.8.0-RC1
Closes gh-28253
2021-10-15 10:08:01 +02:00
Stephane Nicoll
1a1d074f5b Upgrade to Spring HATEOAS 1.3.5
Closes gh-28243
2021-10-15 10:07:02 +02:00
Stephane Nicoll
e3a2d42a96 Upgrade to Micrometer 1.7.5
Closes gh-28242
2021-10-15 10:06:33 +02:00
Stephane Nicoll
c743442a78 Upgrade to Spring HATEOAS 1.2.10
Closes gh-28358
2021-10-15 09:58:05 +02:00
Stephane Nicoll
a569786b79 Upgrade to Micrometer 1.6.12
Closes gh-28224
2021-10-15 09:57:29 +02:00
Phillip Webb
bcef8ee4c9 Merge branch '2.5.x'
Closes gh-28357
2021-10-14 21:49:06 -07:00
Phillip Webb
a93304c973 Merge branch '2.4.x' into 2.5.x
Closes gh-28356
2021-10-14 21:48:53 -07:00
Phillip Webb
7388f2b60b Attempt to reduce JarFileWrapper heap consumption
Update `JarURLConnection` to use a single shared wrapper per
jar file rather than creating a new one each time. This update
should help to reduce GC pressure.

Fixes gh-28042
2021-10-14 21:48:01 -07:00
Phillip Webb
66aa713b85 Merge branch '2.5.x' 2021-10-14 17:41:06 -07:00
Phillip Webb
467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb
8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
2021-10-14 17:38:05 -07:00
Phillip Webb
670d1672de Revert "Remove unnecessary bind-api dependency from test starter"
This reverts commit 9867651024b095760366a5e0f8282af89fca47d5.

See gh-28085
2021-10-14 14:26:02 -07:00
Phillip Webb
37426df148 Merge branch '2.5.x'
Closes gh-28354
2021-10-14 12:25:38 -07:00
Phillip Webb
cf8a1b8b04 Merge branch '2.4.x' into 2.5.x
Closes gh-28353
2021-10-14 12:24:04 -07:00
Phillip Webb
b68b3737d7 Sanitize flattened VCAP_SERVICES properties
Update `Sanitizer` to also include flattened `vcap.services.*`
properties.

Fixes gh-28085
2021-10-14 12:22:57 -07:00