Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,567 Commits 23 Branches 0 Tags
2884ec81e9e42d4771e204ef70366f74fbcbeb1c
Commit Graph

37567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave
2884ec81e9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31926
 2022-07-29 11:33:17 -07:00
Madhura Bhave
cc15eb0b96 Configure existing probes at additional path when necessary 
Fixes gh-30612
 2022-07-29 11:31:19 -07:00
Stephane Nicoll
4806881716 Merge branch '2.6.x' into 2.7.x 
Closes gh-31921
 2022-07-29 14:35:15 +02:00
Stephane Nicoll
3a5b40645a Restore support for C3P0 
Closes gh-31920
 2022-07-29 14:07:59 +02:00
Andy Wilkinson
6d279abe21 Merge branch '2.6.x' into 2.7.x 
Closes gh-31914
 2022-07-29 07:06:09 +01:00
Andy Wilkinson
2596d616cb Merge pull request #31912 from Kalpesh-18 
* gh-31912:
  Polish "Allow config prop annotation processor to find reactive cookie props"
  Allow config prop annotation processor to find reactive cookie props

Closes gh-31912
 2022-07-29 07:05:30 +01:00
Andy Wilkinson
d39e146a7d Polish "Allow config prop annotation processor to find reactive cookie props" 
See gh-31912
 2022-07-29 07:05:21 +01:00
Kalpesh
1f0d5f1130 Allow config prop annotation processor to find reactive cookie props 
See gh-31912
 2022-07-29 07:05:21 +01:00
Andy Wilkinson
53703206ae Merge branch '2.6.x' into 2.7.x 
Closes gh-31910
 2022-07-28 16:31:47 +01:00
Andy Wilkinson
532285b47e Add support for upgrading specific libraries with Bomr 
Closes gh-31909
 2022-07-28 16:30:52 +01:00
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