Commit Graph

36414 Commits

Author SHA1 Message Date
Phillip Webb
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
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
2022-07-27 18:29:54 +01:00
Stephane Nicoll
9184d5483a Remove reference to nitrite-spring-boot-starter
Closes gh-31892
2022-07-27 18:32:19 +02:00
Stephane Nicoll
e6a9e48c54 Remove reference to Azure Application Insights
Closes gh-31889
2022-07-27 18:28:52 +02:00
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
2022-07-27 08:37:25 +02:00
Stephane Nicoll
59139e632b Polish "Disable auto-detection in tests that start Hazelcast"
See gh-31863
2022-07-27 08:30:17 +02:00
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
2022-07-27 08:16:48 +02:00
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
2022-07-27 08:15:53 +02:00
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
2022-07-26 18:15:52 +01:00
Phillip Webb
59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction"
See gh-31676
2022-07-26 18:15:32 +01:00
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
2022-07-26 18:15:32 +01:00
Andy Wilkinson
5243cb8369 Broaded dependency management for REST Assured
Closes gh-31864
2022-07-26 17:54:47 +01:00
Phillip Webb
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
aoyvx
8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset
See gh-31870
2022-07-26 17:20:55 +01:00
Phillip Webb
9329acdad8 Reduce size of 'repeated-open-array.txt' file
Attempt to fix CI memory issues.
2022-07-26 16:13:44 +01:00
Phillip Webb
da91cde304 Protect against deeply nested JSON maps
See gh-31868
2022-07-26 15:52:57 +01:00
Phillip Webb
4132414206 Protect against deeply malformed JSON map keys
Fixes gh-31869
2022-07-26 15:47:50 +01:00
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
2022-07-26 15:25:38 +01:00
Phillip Webb
24c4ba3b53 Merge pull request #31734 from marcwrobel
* pr/31734:
  Update copyright year for "Fix typos in code and documentation"
  Fix typos in code and documentation

Closes gh-31734
2022-07-26 12:09:29 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb
4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Phillip Webb
757a0c2664 Update copyright year of changed files 2022-07-26 10:34:18 +01:00
Andy Wilkinson
dd1d7a1c03 Merge pull request #31845 from dreis2211
* gh-31845:
  Polish

Closes gh-31845
2022-07-22 14:46:20 +01:00
dreis2211
de5834d203 Polish
See gh-31845
2022-07-22 14:46:01 +01:00
Andy Wilkinson
a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Spring Builds
75359a2bce Next development version (v2.6.11-SNAPSHOT) 2022-07-21 07:55:44 +00:00
Stephane Nicoll
07f332ad96 Upgrade to Tomcat 9.0.65
Closes gh-31829
2022-07-21 07:48:24 +02:00
Scott Frederick
4e0b3aad9f Clarify how docker image publishing registry is determined
Closes gh-31820
2022-07-20 17:29:40 -05:00
Scott Frederick
a7dfeae09c Merge branch 'gh-28844' into 2.6.x
Closes gh-31823
2022-07-20 15:10:27 -05:00
Scott Frederick
9b0cdac58a Simplify support for pushing images to unauthenticated registries
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
2022-07-20 15:06:05 -05:00
Andy Wilkinson
ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2022-07-20 20:52:02 +01:00
Andy Wilkinson
5afa04f3cd Remove redundant Checkstyle suppression
Closes gh-30131
2022-07-20 19:49:53 +01:00
Andy Wilkinson
182adeed35 Add modules to dependency management for Derby
Closes gh-31570
2022-07-20 19:23:50 +01:00
Andy Wilkinson
efdd844c7a Log a warning if determining the app's PID takes too long
Closes gh-31572
2022-07-20 11:53:12 +01:00
Andy Wilkinson
bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function
Closes gh-31784
2022-07-20 10:42:56 +01:00
Andy Wilkinson
628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy
Closes gh-31718
2022-07-20 10:15:52 +01:00
Stephane Nicoll
043354f93b Merge pull request #31798 from aoyvx
* pr/31798:
  Update copyright year of changed file
  Use Bean ClassLoader consistently to resolve class names

Closes gh-31798
2022-07-20 09:52:27 +02:00
Stephane Nicoll
585a57be76 Update copyright year of changed file
See gh-31798
2022-07-20 09:45:57 +02:00
aoyvx
abe938eb2c Use Bean ClassLoader consistently to resolve class names
See gh-31798
2022-07-20 09:45:33 +02:00
Stephane Nicoll
ac65835103 Upgrade to Spring Integration 5.5.14
Closes gh-31799
2022-07-20 09:16:17 +02:00
Stephane Nicoll
e48f5de20f Upgrade to AppEngine SDK 1.9.98
Closes gh-31788
2022-07-19 14:09:31 +02:00
Andy Wilkinson
a326a1291e Upgrade to Spring Kafka 2.8.8
Closes gh-31785
2022-07-18 20:10:36 +01:00
Stephane Nicoll
e25d3d6a03 Upgrade to Spring Data 2021.1.6
Closes gh-31611
2022-07-18 15:17:02 +02:00
Stephane Nicoll
febd346bab Merge pull request #31571 from TheoCaldas
* pr/31571:
  Update copyright year of changed files
  Delimit output value in failure analysis

Closes gh-31571
2022-07-18 11:49:17 +02:00
Stephane Nicoll
4eb5037828 Update copyright year of changed files
See gh-31571
2022-07-18 11:48:35 +02:00
TheoCaldas
869ed4f71a Delimit output value in failure analysis
See gh-31571
2022-07-18 11:36:39 +02:00
Stephane Nicoll
3e3ea914bb Merge pull request #31539 from izeye
* pr/31539:
  Disable incompatible tests on macOS AArch64

Closes gh-31539
2022-07-18 11:30:13 +02:00
Johnny Lim
f591c75ad7 Disable incompatible tests on macOS AArch64
This commit also updates related test support classes.

See gh-31539
2022-07-18 11:25:52 +02:00
Andy Wilkinson
8c4708982b Test our Gradle plugin against 7.5
Closes gh-31753
2022-07-14 17:25:34 +01:00