Stephane Nicoll
53a652ec65
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31883
2022-07-27 09:23:05 +02:00
Stephane Nicoll
9cb614c626
Migrate Hazelcast 3 sanity tests to Hazelcast 4
...
Closes gh-31881
2022-07-27 09:09:35 +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
bfc703a40d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31879
2022-07-26 18:16:13 +01: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
3a9525b5b7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31877
2022-07-26 17:58:12 +01:00
Andy Wilkinson
5243cb8369
Broaded dependency management for REST Assured
...
Closes gh-31864
2022-07-26 17:54:47 +01:00
Phillip Webb
fd076ab9ef
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31875
2022-07-26 17:46:20 +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
fcf12686b7
Merge branch '2.6.x' into 2.7.x
2022-07-26 16:14:18 +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
96fa4cd63c
Merge branch '2.6.x' into 2.7.x
2022-07-26 15:53:17 +01:00
Phillip Webb
da91cde304
Protect against deeply nested JSON maps
...
See gh-31868
2022-07-26 15:52:57 +01:00
Phillip Webb
06805f06af
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31873
2022-07-26 15:52:12 +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
466724f77a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31871
2022-07-26 15:37:41 +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
a4ef6a7c5c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31865
2022-07-26 12:13:16 +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
3931e82841
Merge branch '2.6.x' into 2.7.x
2022-07-26 10:50:42 +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
ac3f552dde
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31846
2022-07-22 14:47:45 +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
64dcfe520d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31842
2022-07-22 12:15:39 +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
Andy Wilkinson
86db9091cf
Merge branch '2.6.x' into 2.7.x
2022-07-21 12:16:03 +01:00
Spring Builds
0cf561a759
Next development version (v2.7.3-SNAPSHOT)
2022-07-21 09:24:22 +00:00
Spring Builds
75359a2bce
Next development version (v2.6.11-SNAPSHOT)
2022-07-21 07:55:44 +00:00
Stephane Nicoll
16f63afd0b
Merge branch '2.6.x' into 2.7.x
2022-07-21 08:06:31 +02:00
Stephane Nicoll
c8e44372b2
Upgrade to Tomcat 9.0.65
...
Closes gh-31831
2022-07-21 07:50:53 +02:00
Stephane Nicoll
aa93b2153a
Upgrade to Embedded Mongo 3.4.7
...
Closes gh-31830
2022-07-21 07:50:49 +02:00
Stephane Nicoll
07f332ad96
Upgrade to Tomcat 9.0.65
...
Closes gh-31829
2022-07-21 07:48:24 +02:00
Scott Frederick
9da38c8d2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31826
2022-07-20 17:29:58 -05: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
f9cf31e59e
Fix compile errors
...
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick
09c7ce6dab
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31824
2022-07-20 15:10:43 -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
2e98cafcca
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31818
2022-07-20 21:01:47 +01: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