Commit Graph

33776 Commits

Author SHA1 Message Date
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
Andy Wilkinson
a722fe46fb Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 13:32:15 +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
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
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
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
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
ea6021cccd Merge branch '2.4.x' into 2.5.x 2021-10-15 10:07:19 +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
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
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
e95b0b5257 Polish 2021-10-14 17:37:48 -07:00
Phillip Webb
670d1672de Revert "Remove unnecessary bind-api dependency from test starter"
This reverts commit 9867651024.

See gh-28085
2021-10-14 14:26:02 -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
Phillip Webb
aeadb0ceb6 Merge branch '2.4.x' into 2.5.x
Closes gh-28351
2021-10-14 12:16:38 -07:00
Andy Wilkinson
540468b2f0 Fix parsing of day duration meter values
Switch `MeterValue` parsing logic so that we try `Duration` before
`double`. Prior to this commit, the value `1d` would result in `1.0`
rather than "1 day".

Fixes gh-28302
2021-10-14 12:13:39 -07:00
Phillip Webb
a9df8c3ef4 Merge branch '2.4.x' into 2.5.x
Closes gh-28349
2021-10-14 12:05:22 -07:00
Phillip Webb
fc2c460512 Merge pull request #28344 from martin-v
* pr/28344:
  Remove unnecessary bind-api dependency from test starter

Closes gh-28344
2021-10-14 12:05:04 -07:00
Martin Vietz
9867651024 Remove unnecessary bind-api dependency from test starter
See gh-28344
2021-10-14 12:02:57 -07:00