Commit Graph

38956 Commits (b68e43f5fd29ead1cdd1ecc17155088f90811e78)
 

Author SHA1 Message Date
Phillip Webb b68e43f5fd Merge branch '2.7.x' 2 years ago
Phillip Webb 2382e8322b Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 2709f77ab9 Collect to named contributors to `LinkedHashMap`
Update `NamedContributorsMapAdapter` to collect items to a
`LinkedHashMap` rather than a `HashMap`.

See gh-31676
2 years ago
Andy Wilkinson 8304282549 Merge branch '2.7.x' 2 years ago
Andy Wilkinson 5a52220675 Merge branch '2.6.x' into 2.7.x 2 years ago
Andy Wilkinson 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
2 years ago
Stephane Nicoll 204354e8ab Merge branch '2.7.x'
Closes gh-31894
2 years ago
Stephane Nicoll 04cb239296 Merge branch '2.6.x' into 2.7.x
Closes gh-31893
2 years ago
Stephane Nicoll 9184d5483a Remove reference to nitrite-spring-boot-starter
Closes gh-31892
2 years ago
Stephane Nicoll 76376d8822 Merge branch '2.7.x'
Closes gh-31891
2 years ago
Stephane Nicoll 344afd81de Merge branch '2.6.x' into 2.7.x
Closes gh-31890
2 years ago
Stephane Nicoll e6a9e48c54 Remove reference to Azure Application Insights
Closes gh-31889
2 years ago
Stephane Nicoll fdb1ee5f97 Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
2 years ago
Stephane Nicoll aac3ccf59c Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27780
2 years ago
Andy Wilkinson ac1203551c Start building against Spring AMQP 3.0.0-M4 snapshots
See gh-31861
2 years ago
Stephane Nicoll c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2 years ago
Stephane Nicoll 53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2 years ago
Stephane Nicoll b507fa9dbc Merge branch '2.7.x'
Closes gh-31882
2 years ago
Stephane Nicoll 9cb614c626 Migrate Hazelcast 3 sanity tests to Hazelcast 4
Closes gh-31881
2 years ago
Stephane Nicoll 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
2 years ago
Stephane Nicoll 59139e632b Polish "Disable auto-detection in tests that start Hazelcast"
See gh-31863
2 years ago
Adrian Bob aad9c8906a Disable auto-detection in tests that start Hazelcast
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
2 years ago
Stephane Nicoll 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
2 years ago
Madhura Bhave aac1829106 Make Batch auto-configuration back-off is spring-jdbc isn't present
See gh-29487
2 years ago
Madhura Bhave 2804c84648 Adapt to spring-jdbc being required by Spring Batch
Closes gh-29487
2 years ago
Phillip Webb 94ca5b5b53 Merge branch '2.7.x'
Closes gh-31880
2 years ago
Phillip Webb bfc703a40d Merge branch '2.6.x' into 2.7.x
Closes gh-31879
2 years ago
Phillip Webb 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
2 years ago
Phillip Webb 59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction"
See gh-31676
2 years ago
Guirong Hu 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
2 years ago
Andy Wilkinson 17aa5d2d23 Merge branch '2.7.x'
Closes gh-31878
2 years ago
Andy Wilkinson 3a9525b5b7 Merge branch '2.6.x' into 2.7.x
Closes gh-31877
2 years ago
Andy Wilkinson 5243cb8369 Broaded dependency management for REST Assured
Closes gh-31864
2 years ago
Phillip Webb 35a65cf82e Merge branch '2.7.x'
Closes gh-31876
2 years ago
Phillip Webb fd076ab9ef Merge branch '2.6.x' into 2.7.x
Closes gh-31875
2 years ago
Phillip Webb 923dd3504b Merge pull request #31870 from aoyvx
* pr/31870:
  Ensure PROTOCOL_HANDLER system property is reset

Closes gh-31870
2 years ago
aoyvx 8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset
See gh-31870
2 years ago
Stephane Nicoll 193c1d7acf Adapt to changes in DefaultGenerationContext
See https://github.com/spring-projects/spring-framework/issues/28877
2 years ago
Phillip Webb d6cce1f441 Merge branch '2.7.x' 2 years ago
Phillip Webb fcf12686b7 Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 9329acdad8 Reduce size of 'repeated-open-array.txt' file
Attempt to fix CI memory issues.
2 years ago
Phillip Webb e08aa84892 Merge branch '2.7.x' 2 years ago
Phillip Webb 96fa4cd63c Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb da91cde304 Protect against deeply nested JSON maps
See gh-31868
2 years ago
Phillip Webb a7ea5dfeda Merge branch '2.7.x'
Closes gh-31874
2 years ago
Phillip Webb 06805f06af Merge branch '2.6.x' into 2.7.x
Closes gh-31873
2 years ago
Phillip Webb 4132414206 Protect against deeply malformed JSON map keys
Fixes gh-31869
2 years ago
Phillip Webb 0b1441f119 Merge branch '2.7.x'
Closes gh-31872
2 years ago
Phillip Webb 466724f77a Merge branch '2.6.x' into 2.7.x
Closes gh-31871
2 years ago
Phillip Webb 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
2 years ago