Stephane Nicoll
1b3f52d609
Harmonize line endings
...
See gh-27615
2021-10-28 15:22:57 +02:00
Andy Wilkinson
7fbbb4e08a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson
72f80f3ae6
Upgrade to Testcontainers 1.16.1
...
Closes gh-28468
2021-10-28 13:06:41 +01:00
Andy Wilkinson
b375f9fac0
Ignore parameters when checking if */* is accepted
...
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.
This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.
Fixes gh-28446
2021-10-28 12:27:34 +01:00
Stephane Nicoll
ce38d592f9
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28466
2021-10-28 11:53:19 +02:00
Stephane Nicoll
265199f42b
Polish "Fix description of "logging.logback.rollingpolicy.max-history""
...
See gh-28448
2021-10-28 11:50:38 +02:00
Guillaume Husta
a05b2207f8
Fix description of "logging.logback.rollingpolicy.max-history"
...
See gh-28448
2021-10-28 11:45:42 +02:00
Andy Wilkinson
4d811f66ec
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28442
2021-10-22 15:48:28 +01:00
Andy Wilkinson
7607587b6c
Stabilize liveReloadOnClassPathChanged()
...
Closes gh-28441
2021-10-22 15:47:51 +01:00
Andy Wilkinson
50d4eaad63
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28439
2021-10-22 15:23:07 +01:00
Andy Wilkinson
a545b6e0b4
Polish "Polish"
...
See gh-28367
2021-10-22 15:19:13 +01:00
Leo Li
1586232761
Polish
...
See gh-28367
2021-10-22 15:11:57 +01:00
Andy Wilkinson
3fb5af9dd3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28434
2021-10-22 12:29:14 +01:00
Andy Wilkinson
8a78864edd
Polish "Explain how to disable/configure the ActiveMQ embedded broker"
...
See gh-28183
2021-10-22 12:27:50 +01:00
Moritz Kammerer
0c5f0efcea
Explain how to disable/configure the ActiveMQ embedded broker
...
See gh-28183
2021-10-22 12:27:37 +01:00
Stephane Nicoll
1edd1e8c20
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28433
2021-10-22 11:26:54 +02:00
Stephane Nicoll
773b0f93b7
Upgrade to Commons Compress 1.21
...
Closes gh-28429
2021-10-22 11:26:22 +02:00
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
Stephane Nicoll
6cdafc4b72
Upgrade to Spring Session 2021.0.3
...
Closes gh-28248
2021-10-21 09:13: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
91524ccc95
Upgrade to Spring Framework 5.3.12
...
Closes gh-28223
2021-10-21 08:53:23 +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
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
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
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
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
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
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
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 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
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
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
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
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
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
Martin Vietz
9867651024
Remove unnecessary bind-api dependency from test starter
...
See gh-28344
2021-10-14 12:02:57 -07:00
Phillip Webb
2430d8a41a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28347
2021-10-14 11:27:17 -07:00
Phillip Webb
4dc5142128
Prevent cache from consuming too much memory
...
Change the cache in `CachingOperationInvoker` to be a reference based
map and also clean stale entries when a specific threshold is met.
Fixes gh-28313
2021-10-14 11:23:56 -07:00
Andy Wilkinson
865615e099
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28340
2021-10-14 14:10:33 +01:00
Andy Wilkinson
ce1a1415ab
Use official Jakarta Management API dependency in ActiveMQ starter
...
Fixes gh-28339
2021-10-14 14:10:18 +01:00
Andy Wilkinson
3800f060b5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28336
2021-10-14 13:42:54 +01:00
Andy Wilkinson
2fb8c8d27e
Check starters for unnecessary exclusions
...
Closes gh-28332
2021-10-14 13:37:53 +01:00
Stephane Nicoll
0dcdabed9e
Upgrade to Spring Framework 5.3.11
...
Closes gh-28241
2021-10-14 14:20:06 +02:00
Stephane Nicoll
26d0afc205
Upgrade to Spring Framework 5.3.11
...
Closes gh-28223
2021-10-14 14:18:54 +02:00
Andy Wilkinson
5fd5556b1f
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28333
2021-10-14 10:37:16 +01:00
Martin Vietz
a10db66b16
Remove unnecessary mail dependency from oauth2-client starter
...
See gh-28308
2021-10-14 10:36:16 +01:00
Andy Wilkinson
d3037103fe
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28330
2021-10-14 10:13:24 +01:00
Andy Wilkinson
9f13941c2f
Prohibit org.jboss.spec.* dependencies
...
Closes gh-28329
2021-10-14 10:09:30 +01:00
Phillip Webb
02b577390f
Merge branch '2.4.x' into 2.5.x
2021-10-13 18:47:51 -07:00
Phillip Webb
0561992c2a
Update copyright year of changed files
2021-10-13 18:45:38 -07:00
Phillip Webb
9abf9e6731
Modify more tests for static resource location filtering
...
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.
See gh-28223
2021-10-13 18:45:22 -07:00
Scott Frederick
f427ea5802
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28304
2021-10-12 18:00:15 -05:00
Scott Frederick
3d21ac7a20
Add required id field to Spring Data Neo4j test class
...
Fixes gh-28303
2021-10-12 17:59:19 -05:00
Scott Frederick
3755c563df
Merge branch '2.4.x' into 2.5.x
2021-10-12 16:45:51 -05:00
Scott Frederick
3c6e061917
Remove unused import
...
See gh-28223
2021-10-12 16:45:43 -05:00
Scott Frederick
ec6bfa8062
Merge branch '2.4.x' into 2.5.x
2021-10-12 16:17:48 -05:00
Scott Frederick
207b76c39e
Modify tests to expect filtering of static resource locations
...
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.
See gh-28223
2021-10-12 16:17:16 -05:00
Stephane Nicoll
f04da491b2
Upgrade to Reactor 2020.0.12
...
Closes gh-28240
2021-10-12 16:06:21 +02:00
Stephane Nicoll
fdf4e14f54
Upgrade to Reactor 2020.0.12
...
Closes gh-28222
2021-10-12 16:05:47 +02:00