Andy Wilkinson
24ef4e6fb9
Merge branch '2.5.x'
...
Closes gh-28471
2021-10-28 13:07:22 +01: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
e340429a1a
Merge branch '2.5.x'
...
Closes gh-28469
2021-10-28 12:50:23 +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
ea8a8ecd0e
Merge branch '2.5.x'
...
Closes gh-28467
2021-10-28 11:53:34 +02: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
e4c96b3684
Merge pull request #28448 from ghusta
...
* pr/28448:
Polish "Fix description of "logging.logback.rollingpolicy.max-history""
Fix description of "logging.logback.rollingpolicy.max-history"
Closes gh-28448
2021-10-28 11:51:21 +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
Stephane Nicoll
9b268cc7f4
Merge branch '2.5.x'
2021-10-28 08:45:43 +02:00
Stephane Nicoll
1b4eb16c83
Upgrade CI to Docker 20.10.10
...
Closes gh-28457
2021-10-28 08:45:32 +02:00
Stephane Nicoll
281f1d4e99
Upgrade Java 17 version in CI image
...
Closes gh-28465
2021-10-28 08:44:53 +02:00
Stephane Nicoll
3d8d61de3f
Upgrade Java 11 version in CI image
...
Closes gh-28463
2021-10-28 08:42:59 +02:00
Stephane Nicoll
2c5e20def5
Upgrade Java 8 version in CI image
...
Closes gh-28461
2021-10-28 08:42:26 +02:00
Stephane Nicoll
37d96a94bf
Merge branch '2.4.x' into 2.5.x
2021-10-28 08:41:43 +02:00
Stephane Nicoll
c8154442ec
Upgrade CI to Docker 20.10.10
...
Closes gh-28454
2021-10-28 08:41:34 +02:00
Stephane Nicoll
545ac4581b
Upgrade Java 17 version in CI image
...
Closes gh-28460
2021-10-28 08:40:55 +02:00
Stephane Nicoll
bc97a51db0
Upgrade Java 11 version in CI image
...
Closes gh-28458
2021-10-28 08:40:20 +02:00
Stephane Nicoll
1e4cc60167
Upgrade Java 8 version in CI image
...
Closes gh-28459
2021-10-28 08:39:50 +02:00
Stephane Nicoll
30a75e89d1
Upgrade CI to Docker 20.10.10
...
Closes gh-28462
2021-10-28 08:38:49 +02:00
Stephane Nicoll
b481c81e36
Upgrade Java 11 version in CI image
...
Closes gh-28456
2021-10-28 08:38:08 +02:00
Stephane Nicoll
43d4fe254c
Upgrade Java 8 version in CI image
...
Closes gh-28455
2021-10-28 08:37:03 +02:00
Phillip Webb
9cb5f035e7
Fix typo
...
See gh-20971
2021-10-23 08:29:51 -07:00
Stephane Nicoll
837e2ac277
Fix bean type visibility
...
Closes gh-28437
2021-10-23 07:31:27 +02:00
Phillip Webb
a392d80b4f
Merge pull request #28138 from vignesh1992
...
* pr/28138:
Polish 'Support both kebab-case and camelCase as Spring init CLI Options'
Support both kebab-case and camelCase as Spring init CLI Options
Closes gh-28138
2021-10-22 11:23:26 -07:00
Phillip Webb
c384fbd14e
Polish 'Support both kebab-case and camelCase as Spring init CLI Options'
...
Refine the command so that camelCase options are supported but not
advertised.
See gh-28138
2021-10-22 11:23:14 -07:00
vignesh1992
ad3473208f
Support both kebab-case and camelCase as Spring init CLI Options
...
Update `InitCommand` to support both camelCase and kebab-case.
See gh-28138
2021-10-22 11:23:14 -07:00
Andy Wilkinson
b9f0ec5df8
Merge branch '2.5.x'
...
Closes gh-28443
2021-10-22 15:48:43 +01: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
3605388787
Merge branch '2.5.x'
...
Closes gh-28440
2021-10-22 15:24:13 +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
8622418e5d
Merge pull request #28367 from polarbear567
...
* gh-28367:
Polish "Polish"
Polish
Closes gh-28367
2021-10-22 15:19:32 +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
Stephane Nicoll
b686af61e0
Merge pull request #28436 from sokomishalov
...
* pr/28436:
Polish "Fix classpath condition for Lettuce metrics auto-configuration"
Fix classpath condition for Lettuce metrics auto-configuration
Closes gh-28436
2021-10-22 14:53:10 +02:00
Stephane Nicoll
475e9c9969
Polish "Fix classpath condition for Lettuce metrics auto-configuration"
...
See gh-28436
2021-10-22 14:49:33 +02:00
sokomishalov
1f86fe3d48
Fix classpath condition for Lettuce metrics auto-configuration
...
See gh-28436
2021-10-22 14:47:56 +02:00
Andy Wilkinson
1005159eab
Merge branch '2.5.x'
...
Closes gh-28435
2021-10-22 12:30:47 +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
7a38455591
Merge pull request #28183 from phxql
...
* gh-28183:
Polish "Explain how to disable/configure the ActiveMQ embedded broker"
Explain how to disable/configure the ActiveMQ embedded broker
Closes gh-28183
2021-10-22 12:28:45 +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
ed36fd121e
Merge branch '2.5.x'
2021-10-22 11:27:24 +02: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
47da70632f
Merge branch '2.5.x'
...
Closes gh-28430
Closes gh-28431
2021-10-22 10:12:53 +01: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