37657 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Stephane Nicoll	6786659aae	Merge branch '2.6.x' into 2.7.x	2022-07-28 16:07:18 +02:00
Stephane Nicoll	7d860df5f0	Polish	2022-07-28 16:05:16 +02:00
Andy Wilkinson	4f0dac7601	Merge branch '2.6.x' into 2.7.x ... Closes gh-31906	2022-07-28 14:50:00 +01:00
Andy Wilkinson	348b2c28e9	Improve logging of changes that trigger a DevTools upload or restart ... Closes gh-31579	2022-07-28 14:13:23 +01:00
Phillip Webb	5c52882f76	Merge branch '2.6.x' into 2.7.x ... Closes gh-31901	2022-07-28 10:44:42 +01:00
Phillip Webb	9a2ad6d42d	Remove references to ConfigFileApplicationListener ... Update documentation and meta-data to remove referenced to the now deprecated `ConfigFileApplicationListener` class. Closes gh-31895	2022-07-28 10:43:48 +01:00
Phillip Webb	220c588996	Merge branch '2.6.x' into 2.7.x ... Closes gh-31899	2022-07-28 10:37:00 +01:00
Phillip Webb	98627e3d71	Fix spring.beaninfo.ignore SourceType ... Fixes gh-31898	2022-07-28 10:36:19 +01:00
Phillip Webb	2382e8322b	Merge branch '2.6.x' into 2.7.x	2022-07-27 19:22:45 +01:00
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	5a52220675	Merge branch '2.6.x' into 2.7.x	2022-07-27 18:33:38 +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	04cb239296	Merge branch '2.6.x' into 2.7.x ... Closes gh-31893	2022-07-27 18:32:28 +02:00
Stephane Nicoll	9184d5483a	Remove reference to nitrite-spring-boot-starter ... Closes gh-31892	2022-07-27 18:32:19 +02:00
Stephane Nicoll	344afd81de	Merge branch '2.6.x' into 2.7.x ... Closes gh-31890	2022-07-27 18:29:07 +02:00
Stephane Nicoll	e6a9e48c54	Remove reference to Azure Application Insights ... Closes gh-31889	2022-07-27 18:28:52 +02:00
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