2382e8322b
Merge branch '2.6.x' into 2.7.x
2022-07-27 19:22:45 +01:00
2709f77ab9
Collect to named contributors to `LinkedHashMap`
...
Update `NamedContributorsMapAdapter` to collect items to a
`LinkedHashMap` rather than a `HashMap`.
See gh-31676
2022-07-27 18:46:42 +01:00
8304282549
Merge branch '2.7.x'
2022-07-27 18:34:49 +01:00
5a52220675
Merge branch '2.6.x' into 2.7.x
2022-07-27 18:33:38 +01:00
a4bafa88bc
Disable schema validation when testing against Hazelcast 3
...
We have hazelcast configuration files that are used with multiple
versions of Hazelcast. Version 3's scheme doesn't allow us to set
<auto-detection enabled="false" />. To work around this, we
configure a system property that causes Hazelcast to disable schema
validation.
See gh-38163
2022-07-27 18:29:54 +01:00
204354e8ab
Merge branch '2.7.x'
...
Closes gh-31894
2022-07-27 18:32:38 +02:00
04cb239296
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31893
2022-07-27 18:32:28 +02:00
9184d5483a
Remove reference to nitrite-spring-boot-starter
...
Closes gh-31892
2022-07-27 18:32:19 +02:00
76376d8822
Merge branch '2.7.x'
...
Closes gh-31891
2022-07-27 18:29:17 +02:00
344afd81de
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31890
2022-07-27 18:29:07 +02:00
e6a9e48c54
Remove reference to Azure Application Insights
...
Closes gh-31889
2022-07-27 18:28:52 +02:00
fdb1ee5f97
Adapt to deprecations in Spring Framework
...
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
2022-07-27 18:18:09 +02:00
aac3ccf59c
Adapt to deprecations in Spring Framework
...
See https://github.com/spring-projects/spring-framework/issues/27780
2022-07-27 17:47:02 +02:00
ac1203551c
Start building against Spring AMQP 3.0.0-M4 snapshots
...
See gh-31861
2022-07-27 15:55:42 +01:00
c413f9adbe
Merge branch '2.7.x'
...
Closes gh-31884
2022-07-27 09:23:39 +02:00
53a652ec65
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31883
2022-07-27 09:23:05 +02:00
b507fa9dbc
Merge branch '2.7.x'
...
Closes gh-31882
2022-07-27 09:14:02 +02:00
9cb614c626
Migrate Hazelcast 3 sanity tests to Hazelcast 4
...
Closes gh-31881
2022-07-27 09:09:35 +02:00
e92c64f633
Merge pull request #31863 from adrianbob
...
* pr/31863:
Polish "Disable auto-detection in tests that start Hazelcast"
Disable auto-detection in tests that start Hazelcast
Closes gh-31863
2022-07-27 08:37:25 +02:00
59139e632b
Polish "Disable auto-detection in tests that start Hazelcast"
...
See gh-31863
2022-07-27 08:30:17 +02:00
aad9c8906a
Disable auto-detection in tests that start Hazelcast
...
This commit updates test configurations to disable auto-detection of
Hazelcast instances.
See gh-31863
2022-07-27 08:16:48 +02:00
782e3f75b6
Polish Hazelcast configuration
...
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.
See gh-31863
2022-07-27 08:15:53 +02:00
aac1829106
Make Batch auto-configuration back-off is spring-jdbc isn't present
...
See gh-29487
2022-07-26 15:11:00 -07:00
2804c84648
Adapt to spring-jdbc being required by Spring Batch
...
Closes gh-29487
2022-07-26 14:03:22 -07:00
94ca5b5b53
Merge branch '2.7.x'
...
Closes gh-31880
2022-07-26 18:16:44 +01:00
bfc703a40d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31879
2022-07-26 18:16:13 +01:00
1e886bd083
Merge pull request #31676 from terminux
...
* pr/31676:
Polish "Call the value adapter during NamedContributorsMapAdapter construction"
Call the value adapter during NamedContributorsMapAdapter construction
Closes gh-31676
2022-07-26 18:15:52 +01:00
59c9a9cd8a
Polish "Call the value adapter during NamedContributorsMapAdapter construction"
...
See gh-31676
2022-07-26 18:15:32 +01:00
c530f12cc3
Call the value adapter during NamedContributorsMapAdapter construction
...
Update `NamedContributorsMapAdapter` so that the adapter function is
called only once per entry. Prior to this commit, the adapter was called
dynamically which made `CompositeHealthContributor` behave differently
from a regular `HealthContributor`.
See gh-31676
2022-07-26 18:15:32 +01:00
17aa5d2d23
Merge branch '2.7.x'
...
Closes gh-31878
2022-07-26 17:58:40 +01:00
3a9525b5b7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31877
2022-07-26 17:58:12 +01:00
5243cb8369
Broaded dependency management for REST Assured
...
Closes gh-31864
2022-07-26 17:54:47 +01:00
35a65cf82e
Merge branch '2.7.x'
...
Closes gh-31876
2022-07-26 17:48:00 +01:00
fd076ab9ef
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31875
2022-07-26 17:46:20 +01:00
923dd3504b
Merge pull request #31870 from aoyvx
...
* pr/31870:
Ensure PROTOCOL_HANDLER system property is reset
Closes gh-31870
2022-07-26 17:46:11 +01:00
8c93d2e8a7
Ensure PROTOCOL_HANDLER system property is reset
...
See gh-31870
2022-07-26 17:20:55 +01:00
193c1d7acf
Adapt to changes in DefaultGenerationContext
...
See https://github.com/spring-projects/spring-framework/issues/28877
2022-07-26 18:06:46 +02:00
d6cce1f441
Merge branch '2.7.x'
2022-07-26 16:14:34 +01:00
fcf12686b7
Merge branch '2.6.x' into 2.7.x
2022-07-26 16:14:18 +01:00
9329acdad8
Reduce size of 'repeated-open-array.txt' file
...
Attempt to fix CI memory issues.
2022-07-26 16:13:44 +01:00
e08aa84892
Merge branch '2.7.x'
2022-07-26 15:53:33 +01:00
96fa4cd63c
Merge branch '2.6.x' into 2.7.x
2022-07-26 15:53:17 +01:00
da91cde304
Protect against deeply nested JSON maps
...
See gh-31868
2022-07-26 15:52:57 +01:00
a7ea5dfeda
Merge branch '2.7.x'
...
Closes gh-31874
2022-07-26 15:52:33 +01:00
06805f06af
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31873
2022-07-26 15:52:12 +01:00
4132414206
Protect against deeply malformed JSON map keys
...
Fixes gh-31869
2022-07-26 15:47:50 +01:00
0b1441f119
Merge branch '2.7.x'
...
Closes gh-31872
2022-07-26 15:38:25 +01:00
466724f77a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31871
2022-07-26 15:37:41 +01:00
6966ebd2a3
Protect against deeply nested JSON lists
...
Update `BasicJsonParser` to protect against deeply nested JSON lists
in the same way as Jackson.
Fixes gh-31868
2022-07-26 15:25:38 +01:00
7377d85096
Merge branch '2.7.x'
...
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb
Andy Wilkinson
Stephane Nicoll
Adrian Bob
Madhura Bhave
Guirong Hu
aoyvx